[Pkg-owncloud-commits] [owncloud] 14/20: Imported Upstream version 6.0.3+dfsg

David Prévot taffit at moszumanska.debian.org
Tue Apr 29 17:37:55 UTC 2014


This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit e5175d7966793e3944c591bc6984365896130054
Merge: 61eba84 835025e
Author: David Prévot <taffit at debian.org>
Date:   Mon Apr 28 22:18:35 2014 -0400

    Imported Upstream version 6.0.3+dfsg

 3rdparty/PHPExcel/Classes/PHPExcel.php             |   895 -
 3rdparty/PHPExcel/Classes/PHPExcel/Autoloader.php  |    85 -
 .../Classes/PHPExcel/CachedObjectStorage/APC.php   |   295 -
 .../PHPExcel/CachedObjectStorage/CacheBase.php     |   318 -
 .../PHPExcel/CachedObjectStorage/DiscISAM.php      |   219 -
 .../PHPExcel/CachedObjectStorage/ICache.php        |   112 -
 .../PHPExcel/CachedObjectStorage/Igbinary.php      |   152 -
 .../PHPExcel/CachedObjectStorage/Memcache.php      |   312 -
 .../PHPExcel/CachedObjectStorage/Memory.php        |   125 -
 .../PHPExcel/CachedObjectStorage/MemoryGZip.php    |   137 -
 .../CachedObjectStorage/MemorySerialized.php       |   137 -
 .../PHPExcel/CachedObjectStorage/PHPTemp.php       |   206 -
 .../PHPExcel/CachedObjectStorage/SQLite.php        |   306 -
 .../PHPExcel/CachedObjectStorage/SQLite3.php       |   345 -
 .../PHPExcel/CachedObjectStorage/Wincache.php      |   294 -
 .../PHPExcel/CachedObjectStorageFactory.php        |   251 -
 .../PHPExcel/CalcEngine/CyclicReferenceStack.php   |    98 -
 .../Classes/PHPExcel/CalcEngine/Logger.php         |   153 -
 3rdparty/PHPExcel/Classes/PHPExcel/Calculation.php |  3891 ---
 .../Classes/PHPExcel/Calculation/Database.php      |   725 -
 .../Classes/PHPExcel/Calculation/DateTime.php      |  1475 -
 .../Classes/PHPExcel/Calculation/Engineering.php   |  2505 --
 .../Classes/PHPExcel/Calculation/Exception.php     |    52 -
 .../PHPExcel/Calculation/ExceptionHandler.php      |    49 -
 .../Classes/PHPExcel/Calculation/Financial.php     |  2292 --
 .../Classes/PHPExcel/Calculation/FormulaParser.php |   614 -
 .../Classes/PHPExcel/Calculation/FormulaToken.php  |   176 -
 .../Classes/PHPExcel/Calculation/Function.php      |   149 -
 .../Classes/PHPExcel/Calculation/Functions.php     |   815 -
 .../Classes/PHPExcel/Calculation/Logical.php       |   288 -
 .../Classes/PHPExcel/Calculation/LookupRef.php     |   812 -
 .../Classes/PHPExcel/Calculation/MathTrig.php      |  1369 -
 .../Classes/PHPExcel/Calculation/Statistical.php   |  3651 ---
 .../Classes/PHPExcel/Calculation/TextData.php      |   589 -
 .../Classes/PHPExcel/Calculation/Token/Stack.php   |   115 -
 .../Classes/PHPExcel/Calculation/functionlist.txt  |   351 -
 3rdparty/PHPExcel/Classes/PHPExcel/Cell.php        |   978 -
 .../Classes/PHPExcel/Cell/AdvancedValueBinder.php  |   192 -
 .../PHPExcel/Classes/PHPExcel/Cell/DataType.php    |   122 -
 .../Classes/PHPExcel/Cell/DataValidation.php       |   472 -
 .../Classes/PHPExcel/Cell/DefaultValueBinder.php   |   106 -
 .../PHPExcel/Classes/PHPExcel/Cell/Hyperlink.php   |   126 -
 .../Classes/PHPExcel/Cell/IValueBinder.php         |    46 -
 3rdparty/PHPExcel/Classes/PHPExcel/Chart.php       |   551 -
 .../PHPExcel/Classes/PHPExcel/Chart/DataSeries.php |   354 -
 .../Classes/PHPExcel/Chart/DataSeriesValues.php    |   327 -
 .../PHPExcel/Classes/PHPExcel/Chart/Exception.php  |    52 -
 .../PHPExcel/Classes/PHPExcel/Chart/Layout.php     |   417 -
 .../PHPExcel/Classes/PHPExcel/Chart/Legend.php     |   171 -
 .../PHPExcel/Classes/PHPExcel/Chart/PlotArea.php   |   125 -
 .../Chart/Renderer/PHP Charting Libraries.txt      |    17 -
 .../Classes/PHPExcel/Chart/Renderer/jpgraph.php    |   837 -
 3rdparty/PHPExcel/Classes/PHPExcel/Chart/Title.php |    89 -
 3rdparty/PHPExcel/Classes/PHPExcel/Comment.php     |   327 -
 .../Classes/PHPExcel/DocumentProperties.php        |   587 -
 .../PHPExcel/Classes/PHPExcel/DocumentSecurity.php |   218 -
 3rdparty/PHPExcel/Classes/PHPExcel/Exception.php   |    52 -
 3rdparty/PHPExcel/Classes/PHPExcel/HashTable.php   |   202 -
 3rdparty/PHPExcel/Classes/PHPExcel/IComparable.php |    43 -
 3rdparty/PHPExcel/Classes/PHPExcel/IOFactory.php   |   288 -
 3rdparty/PHPExcel/Classes/PHPExcel/NamedRange.php  |   246 -
 .../PHPExcel/Classes/PHPExcel/Reader/Abstract.php  |   227 -
 3rdparty/PHPExcel/Classes/PHPExcel/Reader/CSV.php  |   415 -
 .../Classes/PHPExcel/Reader/DefaultReadFilter.php  |    58 -
 .../Classes/PHPExcel/Reader/Excel2003XML.php       |   806 -
 .../PHPExcel/Classes/PHPExcel/Reader/Excel2007.php |  2015 --
 .../Classes/PHPExcel/Reader/Excel2007/Chart.php    |   517 -
 .../Classes/PHPExcel/Reader/Excel2007/Theme.php    |   124 -
 .../PHPExcel/Classes/PHPExcel/Reader/Excel5.php    |  6845 -----
 .../Classes/PHPExcel/Reader/Excel5/Escher.php      |   640 -
 .../PHPExcel/Classes/PHPExcel/Reader/Exception.php |    52 -
 .../PHPExcel/Classes/PHPExcel/Reader/Gnumeric.php  |   875 -
 3rdparty/PHPExcel/Classes/PHPExcel/Reader/HTML.php |   468 -
 .../Classes/PHPExcel/Reader/IReadFilter.php        |    47 -
 .../PHPExcel/Classes/PHPExcel/Reader/IReader.php   |    53 -
 .../PHPExcel/Classes/PHPExcel/Reader/OOCalc.php    |   701 -
 3rdparty/PHPExcel/Classes/PHPExcel/Reader/SYLK.php |   450 -
 .../PHPExcel/Classes/PHPExcel/ReferenceHelper.php  |   918 -
 3rdparty/PHPExcel/Classes/PHPExcel/RichText.php    |   199 -
 .../Classes/PHPExcel/RichText/ITextElement.php     |    64 -
 .../PHPExcel/Classes/PHPExcel/RichText/Run.php     |   102 -
 .../Classes/PHPExcel/RichText/TextElement.php      |   108 -
 3rdparty/PHPExcel/Classes/PHPExcel/Settings.php    |   354 -
 .../PHPExcel/Classes/PHPExcel/Shared/CodePage.php  |   101 -
 3rdparty/PHPExcel/Classes/PHPExcel/Shared/Date.php |   390 -
 .../PHPExcel/Classes/PHPExcel/Shared/Drawing.php   |   272 -
 .../PHPExcel/Classes/PHPExcel/Shared/Escher.php    |    91 -
 .../Classes/PHPExcel/Shared/Escher/DgContainer.php |    83 -
 .../Shared/Escher/DgContainer/SpgrContainer.php    |   109 -
 .../DgContainer/SpgrContainer/SpContainer.php      |   395 -
 .../PHPExcel/Shared/Escher/DggContainer.php        |   203 -
 .../Shared/Escher/DggContainer/BstoreContainer.php |    65 -
 .../Escher/DggContainer/BstoreContainer/BSE.php    |   120 -
 .../DggContainer/BstoreContainer/BSE/Blip.php      |    91 -
 .../PHPExcel/Classes/PHPExcel/Shared/Excel5.php    |   317 -
 3rdparty/PHPExcel/Classes/PHPExcel/Shared/File.php |   178 -
 3rdparty/PHPExcel/Classes/PHPExcel/Shared/Font.php |   775 -
 .../Classes/PHPExcel/Shared/JAMA/CHANGELOG.TXT     |    16 -
 .../PHPExcel/Shared/JAMA/CholeskyDecomposition.php |   149 -
 .../Shared/JAMA/EigenvalueDecomposition.php        |   862 -
 .../PHPExcel/Shared/JAMA/LUDecomposition.php       |   258 -
 .../Classes/PHPExcel/Shared/JAMA/Matrix.php        |  1059 -
 .../PHPExcel/Shared/JAMA/QRDecomposition.php       |   234 -
 .../Shared/JAMA/SingularValueDecomposition.php     |   526 -
 .../Classes/PHPExcel/Shared/JAMA/utils/Error.php   |    82 -
 .../Classes/PHPExcel/Shared/JAMA/utils/Maths.php   |    43 -
 3rdparty/PHPExcel/Classes/PHPExcel/Shared/OLE.php  |   531 -
 .../PHPExcel/Shared/OLE/ChainedBlockStream.php     |   229 -
 .../PHPExcel/Classes/PHPExcel/Shared/OLE/PPS.php   |   230 -
 .../Classes/PHPExcel/Shared/OLE/PPS/File.php       |    84 -
 .../Classes/PHPExcel/Shared/OLE/PPS/Root.php       |   467 -
 .../PHPExcel/Classes/PHPExcel/Shared/OLERead.php   |   317 -
 .../Classes/PHPExcel/Shared/PCLZip/gnu-lgpl.txt    |   504 -
 .../Classes/PHPExcel/Shared/PCLZip/pclzip.lib.php  |  5694 ----
 .../Classes/PHPExcel/Shared/PCLZip/readme.txt      |   421 -
 .../Classes/PHPExcel/Shared/PasswordHasher.php     |    66 -
 .../PHPExcel/Classes/PHPExcel/Shared/String.php    |   776 -
 .../PHPExcel/Classes/PHPExcel/Shared/TimeZone.php  |   140 -
 .../PHPExcel/Classes/PHPExcel/Shared/XMLWriter.php |   127 -
 .../Classes/PHPExcel/Shared/ZipArchive.php         |   114 -
 .../Classes/PHPExcel/Shared/ZipStreamWrapper.php   |   201 -
 .../Classes/PHPExcel/Shared/trend/bestFitClass.php |   432 -
 .../Shared/trend/exponentialBestFitClass.php       |   148 -
 .../PHPExcel/Shared/trend/linearBestFitClass.php   |   111 -
 .../Shared/trend/logarithmicBestFitClass.php       |   120 -
 .../Shared/trend/polynomialBestFitClass.php        |   224 -
 .../PHPExcel/Shared/trend/powerBestFitClass.php    |   142 -
 .../Classes/PHPExcel/Shared/trend/trendClass.php   |   156 -
 3rdparty/PHPExcel/Classes/PHPExcel/Style.php       |   613 -
 .../PHPExcel/Classes/PHPExcel/Style/Alignment.php  |   409 -
 .../PHPExcel/Classes/PHPExcel/Style/Border.php     |   294 -
 .../PHPExcel/Classes/PHPExcel/Style/Borders.php    |   424 -
 3rdparty/PHPExcel/Classes/PHPExcel/Style/Color.php |   429 -
 .../Classes/PHPExcel/Style/Conditional.php         |   277 -
 3rdparty/PHPExcel/Classes/PHPExcel/Style/Fill.php  |   321 -
 3rdparty/PHPExcel/Classes/PHPExcel/Style/Font.php  |   532 -
 .../Classes/PHPExcel/Style/NumberFormat.php        |   708 -
 .../PHPExcel/Classes/PHPExcel/Style/Protection.php |   207 -
 .../PHPExcel/Classes/PHPExcel/Style/Supervisor.php |   132 -
 3rdparty/PHPExcel/Classes/PHPExcel/Worksheet.php   |  2818 --
 .../Classes/PHPExcel/Worksheet/AutoFilter.php      |   858 -
 .../PHPExcel/Worksheet/AutoFilter/Column.php       |   394 -
 .../PHPExcel/Worksheet/AutoFilter/Column/Rule.php  |   464 -
 .../Classes/PHPExcel/Worksheet/BaseDrawing.php     |   485 -
 .../Classes/PHPExcel/Worksheet/CellIterator.php    |   161 -
 .../Classes/PHPExcel/Worksheet/ColumnDimension.php |   266 -
 .../Classes/PHPExcel/Worksheet/Drawing.php         |   148 -
 .../Classes/PHPExcel/Worksheet/Drawing/Shadow.php  |   288 -
 .../Classes/PHPExcel/Worksheet/HeaderFooter.php    |   465 -
 .../PHPExcel/Worksheet/HeaderFooterDrawing.php     |   350 -
 .../Classes/PHPExcel/Worksheet/MemoryDrawing.php   |   200 -
 .../Classes/PHPExcel/Worksheet/PageMargins.php     |   220 -
 .../Classes/PHPExcel/Worksheet/PageSetup.php       |   798 -
 .../Classes/PHPExcel/Worksheet/Protection.php      |   545 -
 .../PHPExcel/Classes/PHPExcel/Worksheet/Row.php    |    90 -
 .../Classes/PHPExcel/Worksheet/RowDimension.php    |   265 -
 .../Classes/PHPExcel/Worksheet/RowIterator.php     |   148 -
 .../Classes/PHPExcel/Worksheet/SheetView.php       |   188 -
 .../Classes/PHPExcel/WorksheetIterator.php         |   118 -
 .../PHPExcel/Classes/PHPExcel/Writer/Abstract.php  |   158 -
 3rdparty/PHPExcel/Classes/PHPExcel/Writer/CSV.php  |   313 -
 .../PHPExcel/Classes/PHPExcel/Writer/Excel2007.php |   472 -
 .../Classes/PHPExcel/Writer/Excel2007/Chart.php    |  1184 -
 .../Classes/PHPExcel/Writer/Excel2007/Comments.php |   268 -
 .../PHPExcel/Writer/Excel2007/ContentTypes.php     |   261 -
 .../Classes/PHPExcel/Writer/Excel2007/DocProps.php |   272 -
 .../Classes/PHPExcel/Writer/Excel2007/Drawing.php  |   598 -
 .../Classes/PHPExcel/Writer/Excel2007/Rels.php     |   417 -
 .../PHPExcel/Writer/Excel2007/StringTable.php      |   319 -
 .../Classes/PHPExcel/Writer/Excel2007/Style.php    |   701 -
 .../Classes/PHPExcel/Writer/Excel2007/Theme.php    |   871 -
 .../Classes/PHPExcel/Writer/Excel2007/Workbook.php |   452 -
 .../PHPExcel/Writer/Excel2007/Worksheet.php        |  1214 -
 .../PHPExcel/Writer/Excel2007/WriterPart.php       |    81 -
 .../PHPExcel/Classes/PHPExcel/Writer/Excel5.php    |   935 -
 .../Classes/PHPExcel/Writer/Excel5/BIFFwriter.php  |   255 -
 .../Classes/PHPExcel/Writer/Excel5/Escher.php      |   537 -
 .../Classes/PHPExcel/Writer/Excel5/Font.php        |   165 -
 .../Classes/PHPExcel/Writer/Excel5/Parser.php      |  1582 -
 .../Classes/PHPExcel/Writer/Excel5/Workbook.php    |  1450 -
 .../Classes/PHPExcel/Writer/Excel5/Worksheet.php   |  3681 ---
 .../PHPExcel/Classes/PHPExcel/Writer/Excel5/Xf.php |   546 -
 .../PHPExcel/Classes/PHPExcel/Writer/Exception.php |    52 -
 3rdparty/PHPExcel/Classes/PHPExcel/Writer/HTML.php |  1527 -
 .../PHPExcel/Classes/PHPExcel/Writer/IWriter.php   |    46 -
 3rdparty/PHPExcel/Classes/PHPExcel/Writer/PDF.php  |    90 -
 .../PHPExcel/Classes/PHPExcel/Writer/PDF/Core.php  |   364 -
 .../Classes/PHPExcel/Writer/PDF/DomPDF.php         |   120 -
 .../PHPExcel/Classes/PHPExcel/Writer/PDF/mPDF.php  |   130 -
 .../PHPExcel/Classes/PHPExcel/Writer/PDF/tcPDF.php |   136 -
 .../PHPExcel/Classes/PHPExcel/locale/cs/config     |    47 -
 .../PHPExcel/Classes/PHPExcel/locale/cs/functions  |   438 -
 .../PHPExcel/Classes/PHPExcel/locale/da/config     |    48 -
 .../PHPExcel/Classes/PHPExcel/locale/da/functions  |   438 -
 .../PHPExcel/Classes/PHPExcel/locale/de/config     |    47 -
 .../PHPExcel/Classes/PHPExcel/locale/de/functions  |   438 -
 .../PHPExcel/Classes/PHPExcel/locale/en/uk/config  |    32 -
 .../PHPExcel/Classes/PHPExcel/locale/es/config     |    47 -
 .../PHPExcel/Classes/PHPExcel/locale/es/functions  |   438 -
 .../PHPExcel/Classes/PHPExcel/locale/fi/config     |    47 -
 .../PHPExcel/Classes/PHPExcel/locale/fi/functions  |   438 -
 .../PHPExcel/Classes/PHPExcel/locale/fr/config     |    47 -
 .../PHPExcel/Classes/PHPExcel/locale/fr/functions  |   438 -
 .../PHPExcel/Classes/PHPExcel/locale/hu/config     |    47 -
 .../PHPExcel/Classes/PHPExcel/locale/hu/functions  |   438 -
 .../PHPExcel/Classes/PHPExcel/locale/it/config     |    47 -
 .../PHPExcel/Classes/PHPExcel/locale/it/functions  |   438 -
 .../PHPExcel/Classes/PHPExcel/locale/nl/config     |    47 -
 .../PHPExcel/Classes/PHPExcel/locale/nl/functions  |   438 -
 .../PHPExcel/Classes/PHPExcel/locale/no/config     |    47 -
 .../PHPExcel/Classes/PHPExcel/locale/no/functions  |   438 -
 .../PHPExcel/Classes/PHPExcel/locale/pl/config     |    47 -
 .../PHPExcel/Classes/PHPExcel/locale/pl/functions  |   438 -
 .../PHPExcel/Classes/PHPExcel/locale/pt/br/config  |    47 -
 .../Classes/PHPExcel/locale/pt/br/functions        |   408 -
 .../PHPExcel/Classes/PHPExcel/locale/pt/config     |    47 -
 .../PHPExcel/Classes/PHPExcel/locale/pt/functions  |   408 -
 .../PHPExcel/Classes/PHPExcel/locale/ru/config     |    47 -
 .../PHPExcel/Classes/PHPExcel/locale/ru/functions  |   438 -
 .../PHPExcel/Classes/PHPExcel/locale/sv/config     |    47 -
 .../PHPExcel/Classes/PHPExcel/locale/sv/functions  |   408 -
 .../PHPExcel/Classes/PHPExcel/locale/tr/config     |    47 -
 .../PHPExcel/Classes/PHPExcel/locale/tr/functions  |   438 -
 3rdparty/PHPExcel/changelog.txt                    |  1394 -
 3rdparty/PHPExcel/install.txt                      |    75 -
 3rdparty/PHPExcel/license.txt                      |   345 -
 3rdparty/dompdf/LICENSE.LGPL                       |   456 -
 3rdparty/dompdf/changelog.txt                      |   213 -
 3rdparty/dompdf/docblox.dist.xml                   |    20 -
 3rdparty/dompdf/dompdf.php                         |   286 -
 3rdparty/dompdf/dompdf_config.custom.inc.php       |    29 -
 3rdparty/dompdf/dompdf_config.inc.php              |   384 -
 .../dompdf/include/absolute_positioner.cls.php     |   125 -
 3rdparty/dompdf/include/abstract_renderer.cls.php  |   865 -
 .../dompdf/include/attribute_translator.cls.php    |   477 -
 3rdparty/dompdf/include/autoload.inc.php           |    86 -
 .../dompdf/include/block_frame_decorator.cls.php   |   265 -
 .../dompdf/include/block_frame_reflower.cls.php    |   776 -
 3rdparty/dompdf/include/block_positioner.cls.php   |    54 -
 3rdparty/dompdf/include/block_renderer.cls.php     |   190 -
 .../dompdf/include/cached_pdf_decorator.cls.php    |   154 -
 3rdparty/dompdf/include/canvas.cls.php             |   324 -
 3rdparty/dompdf/include/canvas_factory.cls.php     |    59 -
 3rdparty/dompdf/include/cellmap.cls.php            |   728 -
 3rdparty/dompdf/include/cpdf_adapter.cls.php       |   850 -
 3rdparty/dompdf/include/css_color.cls.php          |   257 -
 3rdparty/dompdf/include/dompdf.cls.php             |   935 -
 3rdparty/dompdf/include/dompdf_exception.cls.php   |    27 -
 .../dompdf/include/dompdf_image_exception.cls.php  |    27 -
 3rdparty/dompdf/include/file.skel                  |     9 -
 3rdparty/dompdf/include/fixed_positioner.cls.php   |    87 -
 3rdparty/dompdf/include/font_metrics.cls.php       |   335 -
 3rdparty/dompdf/include/frame.cls.php              |  1113 -
 3rdparty/dompdf/include/frame_decorator.cls.php    |   562 -
 3rdparty/dompdf/include/frame_factory.cls.php      |   186 -
 3rdparty/dompdf/include/frame_reflower.cls.php     |   415 -
 3rdparty/dompdf/include/frame_tree.cls.php         |   224 -
 3rdparty/dompdf/include/functions.inc.php          |   947 -
 3rdparty/dompdf/include/gd_adapter.cls.php         |   811 -
 3rdparty/dompdf/include/image_cache.cls.php        |   177 -
 .../dompdf/include/image_frame_decorator.cls.php   |    80 -
 .../dompdf/include/image_frame_reflower.cls.php    |   126 -
 3rdparty/dompdf/include/image_renderer.cls.php     |    75 -
 .../dompdf/include/inline_frame_decorator.cls.php  |    75 -
 .../dompdf/include/inline_frame_reflower.cls.php   |    67 -
 3rdparty/dompdf/include/inline_positioner.cls.php  |    71 -
 3rdparty/dompdf/include/inline_renderer.cls.php    |   191 -
 .../dompdf/include/javascript_embedder.cls.php     |    37 -
 3rdparty/dompdf/include/line_box.cls.php           |   228 -
 .../include/list_bullet_frame_decorator.cls.php    |    66 -
 .../include/list_bullet_frame_reflower.cls.php     |    34 -
 .../list_bullet_image_frame_decorator.cls.php      |   143 -
 .../dompdf/include/list_bullet_positioner.cls.php  |    74 -
 .../dompdf/include/list_bullet_renderer.cls.php    |   219 -
 .../dompdf/include/null_frame_decorator.cls.php    |    27 -
 .../dompdf/include/null_frame_reflower.cls.php     |    22 -
 3rdparty/dompdf/include/null_positioner.cls.php    |    24 -
 3rdparty/dompdf/include/page_cache.cls.php         |   127 -
 .../dompdf/include/page_frame_decorator.cls.php    |   596 -
 .../dompdf/include/page_frame_reflower.cls.php     |   217 -
 3rdparty/dompdf/include/pdflib_adapter.cls.php     |  1030 -
 3rdparty/dompdf/include/php_evaluator.cls.php      |    48 -
 3rdparty/dompdf/include/positioner.cls.php         |    52 -
 3rdparty/dompdf/include/renderer.cls.php           |   286 -
 3rdparty/dompdf/include/style.cls.php              |  2211 --
 3rdparty/dompdf/include/stylesheet.cls.php         |  1362 -
 .../include/table_cell_frame_decorator.cls.php     |   103 -
 .../include/table_cell_frame_reflower.cls.php      |   115 -
 .../dompdf/include/table_cell_positioner.cls.php   |    29 -
 .../dompdf/include/table_cell_renderer.cls.php     |   156 -
 .../dompdf/include/table_frame_decorator.cls.php   |   326 -
 .../dompdf/include/table_frame_reflower.cls.php    |   567 -
 .../include/table_row_frame_decorator.cls.php      |    49 -
 .../include/table_row_frame_reflower.cls.php       |    62 -
 .../table_row_group_frame_decorator.cls.php        |    65 -
 .../include/table_row_group_frame_reflower.cls.php |    60 -
 .../include/table_row_group_renderer.cls.php       |    41 -
 .../dompdf/include/table_row_positioner.cls.php    |    36 -
 3rdparty/dompdf/include/tcpdf_adapter.cls.php      |   466 -
 .../dompdf/include/text_frame_decorator.cls.php    |   174 -
 .../dompdf/include/text_frame_reflower.cls.php     |   433 -
 3rdparty/dompdf/include/text_renderer.cls.php      |   150 -
 3rdparty/dompdf/index.php                          |     1 -
 3rdparty/dompdf/lib/class.pdf.php                  |  4969 ---
 3rdparty/dompdf/lib/fonts/Courier-Bold.afm         |   344 -
 3rdparty/dompdf/lib/fonts/Courier-BoldOblique.afm  |   344 -
 3rdparty/dompdf/lib/fonts/Courier-Oblique.afm      |   344 -
 3rdparty/dompdf/lib/fonts/Courier.afm              |   344 -
 3rdparty/dompdf/lib/fonts/DejaVuSans-Bold.ufm      |  5199 ----
 .../dompdf/lib/fonts/DejaVuSans-BoldOblique.ufm    |  4675 ---
 .../dompdf/lib/fonts/DejaVuSans-ExtraLight.ufm     |  1753 --
 3rdparty/dompdf/lib/fonts/DejaVuSans-Oblique.ufm   |  4746 ---
 3rdparty/dompdf/lib/fonts/DejaVuSans.ufm           |  5271 ----
 .../dompdf/lib/fonts/DejaVuSansCondensed-Bold.ufm  |  5199 ----
 .../lib/fonts/DejaVuSansCondensed-BoldOblique.ufm  |  4675 ---
 .../lib/fonts/DejaVuSansCondensed-Oblique.ufm      |  4746 ---
 3rdparty/dompdf/lib/fonts/DejaVuSansCondensed.ufm  |  5271 ----
 3rdparty/dompdf/lib/fonts/DejaVuSansMono-Bold.ufm  |  2969 --
 .../lib/fonts/DejaVuSansMono-BoldOblique.ufm       |  2391 --
 .../dompdf/lib/fonts/DejaVuSansMono-Oblique.ufm    |  2519 --
 3rdparty/dompdf/lib/fonts/DejaVuSansMono.ufm       |  3158 --
 3rdparty/dompdf/lib/fonts/DejaVuSerif-Bold.ufm     |  2971 --
 .../dompdf/lib/fonts/DejaVuSerif-BoldItalic.ufm    |  2963 --
 3rdparty/dompdf/lib/fonts/DejaVuSerif-Italic.ufm   |  3092 --
 3rdparty/dompdf/lib/fonts/DejaVuSerif.ufm          |  3049 --
 .../dompdf/lib/fonts/DejaVuSerifCondensed-Bold.ufm |  2971 --
 .../lib/fonts/DejaVuSerifCondensed-BoldItalic.ufm  |  2963 --
 .../lib/fonts/DejaVuSerifCondensed-Italic.ufm      |  3092 --
 3rdparty/dompdf/lib/fonts/DejaVuSerifCondensed.ufm |  3049 --
 3rdparty/dompdf/lib/fonts/Helvetica-Bold.afm       |  2829 --
 .../dompdf/lib/fonts/Helvetica-BoldOblique.afm     |  2829 --
 3rdparty/dompdf/lib/fonts/Helvetica-Oblique.afm    |  3053 --
 3rdparty/dompdf/lib/fonts/Helvetica.afm            |  3053 --
 3rdparty/dompdf/lib/fonts/Symbol.afm               |   213 -
 3rdparty/dompdf/lib/fonts/Times-Bold.afm           |  2590 --
 3rdparty/dompdf/lib/fonts/Times-BoldItalic.afm     |  2386 --
 3rdparty/dompdf/lib/fonts/Times-Italic.afm         |  2669 --
 3rdparty/dompdf/lib/fonts/Times-Roman.afm          |  2421 --
 3rdparty/dompdf/lib/fonts/ZapfDingbats.afm         |   225 -
 .../lib/fonts/dompdf_font_family_cache.dist.php    |   111 -
 3rdparty/dompdf/lib/fonts/mustRead.html            |    17 -
 3rdparty/dompdf/lib/html5lib/Data.php              |   114 -
 3rdparty/dompdf/lib/html5lib/InputStream.php       |   284 -
 3rdparty/dompdf/lib/html5lib/Parser.php            |    36 -
 3rdparty/dompdf/lib/html5lib/Tokenizer.php         |  2429 --
 3rdparty/dompdf/lib/html5lib/TreeBuilder.php       |  3844 ---
 .../lib/html5lib/named-character-references.ser    |     1 -
 3rdparty/dompdf/lib/php-font-lib/.htaccess         |     1 -
 .../classes/adobe_font_metrics.cls.php             |   208 -
 .../lib/php-font-lib/classes/encoding_map.cls.php  |    36 -
 .../dompdf/lib/php-font-lib/classes/font.cls.php   |    72 -
 .../classes/font_binary_stream.cls.php             |   339 -
 .../lib/php-font-lib/classes/font_eot.cls.php      |    68 -
 .../lib/php-font-lib/classes/font_header.cls.php   |    35 -
 .../lib/php-font-lib/classes/font_opentype.cls.php |    20 -
 .../font_opentype_table_directory_entry.cls.php    |    19 -
 .../lib/php-font-lib/classes/font_table.cls.php    |    84 -
 .../php-font-lib/classes/font_table_cmap.cls.php   |   240 -
 .../classes/font_table_directory_entry.cls.php     |   121 -
 .../php-font-lib/classes/font_table_glyf.cls.php   |    93 -
 .../php-font-lib/classes/font_table_head.cls.php   |    43 -
 .../php-font-lib/classes/font_table_hhea.cls.php   |    42 -
 .../php-font-lib/classes/font_table_hmtx.cls.php   |    54 -
 .../php-font-lib/classes/font_table_kern.cls.php   |    75 -
 .../php-font-lib/classes/font_table_loca.cls.php   |    74 -
 .../php-font-lib/classes/font_table_maxp.cls.php   |    40 -
 .../php-font-lib/classes/font_table_name.cls.php   |    84 -
 .../classes/font_table_name_record.cls.php         |    50 -
 .../php-font-lib/classes/font_table_os2.cls.php    |    45 -
 .../php-font-lib/classes/font_table_post.cls.php   |   142 -
 .../lib/php-font-lib/classes/font_truetype.cls.php |   487 -
 .../classes/font_truetype_collection.cls.php       |    93 -
 .../classes/font_truetype_header.cls.php           |    32 -
 .../font_truetype_table_directory_entry.cls.php    |    26 -
 .../lib/php-font-lib/classes/font_woff.cls.php     |    80 -
 .../php-font-lib/classes/font_woff_header.cls.php  |    33 -
 .../font_woff_table_directory_entry.cls.php        |    25 -
 .../php-font-lib/maps/adobe-standard-encoding.map  |   231 -
 3rdparty/dompdf/lib/php-font-lib/maps/cp1250.map   |   251 -
 3rdparty/dompdf/lib/php-font-lib/maps/cp1251.map   |   255 -
 3rdparty/dompdf/lib/php-font-lib/maps/cp1252.map   |   251 -
 3rdparty/dompdf/lib/php-font-lib/maps/cp1253.map   |   239 -
 3rdparty/dompdf/lib/php-font-lib/maps/cp1254.map   |   249 -
 3rdparty/dompdf/lib/php-font-lib/maps/cp1255.map   |   233 -
 3rdparty/dompdf/lib/php-font-lib/maps/cp1257.map   |   244 -
 3rdparty/dompdf/lib/php-font-lib/maps/cp1258.map   |   247 -
 3rdparty/dompdf/lib/php-font-lib/maps/cp874.map    |   225 -
 .../dompdf/lib/php-font-lib/maps/iso-8859-1.map    |   256 -
 .../dompdf/lib/php-font-lib/maps/iso-8859-11.map   |   248 -
 .../dompdf/lib/php-font-lib/maps/iso-8859-15.map   |   256 -
 .../dompdf/lib/php-font-lib/maps/iso-8859-16.map   |   256 -
 .../dompdf/lib/php-font-lib/maps/iso-8859-2.map    |   256 -
 .../dompdf/lib/php-font-lib/maps/iso-8859-4.map    |   256 -
 .../dompdf/lib/php-font-lib/maps/iso-8859-5.map    |   256 -
 .../dompdf/lib/php-font-lib/maps/iso-8859-7.map    |   250 -
 .../dompdf/lib/php-font-lib/maps/iso-8859-9.map    |   256 -
 3rdparty/dompdf/lib/php-font-lib/maps/koi8-r.map   |   256 -
 3rdparty/dompdf/lib/php-font-lib/maps/koi8-u.map   |   256 -
 3rdparty/dompdf/lib/res/broken_image.png           |   Bin 618 -> 0 bytes
 3rdparty/dompdf/lib/res/html.css                   |   426 -
 3rdparty/dompdf/load_font.php                      |   173 -
 3rdparty/dompdf/readme.html                        |   165 -
 3rdparty/phpdocx/Faq and Docs.txt                  |    12 -
 3rdparty/phpdocx/How to install.txt                |    14 -
 3rdparty/phpdocx/LICENSE                           |   137 -
 3rdparty/phpdocx/Readme.txt                        |    10 -
 3rdparty/phpdocx/classes/AutoLoader.inc            |   143 -
 3rdparty/phpdocx/classes/CreateBarChart.inc        |   287 -
 3rdparty/phpdocx/classes/CreateChartFactory.inc    |    35 -
 3rdparty/phpdocx/classes/CreateChartRels.inc       |   134 -
 3rdparty/phpdocx/classes/CreateCompletedXlsx.inc   |   187 -
 3rdparty/phpdocx/classes/CreateDocument.inc        |    18 -
 3rdparty/phpdocx/classes/CreateDocx.inc            |  3741 ---
 3rdparty/phpdocx/classes/CreateElement.inc         |   975 -
 3rdparty/phpdocx/classes/CreateEmbeddedElement.inc |   114 -
 3rdparty/phpdocx/classes/CreateFactory.inc         |    31 -
 3rdparty/phpdocx/classes/CreateFontTable.inc       |   218 -
 3rdparty/phpdocx/classes/CreateFooter.inc          |   203 -
 3rdparty/phpdocx/classes/CreateGraphic.inc         |  2887 --
 3rdparty/phpdocx/classes/CreateHeader.inc          |   117 -
 3rdparty/phpdocx/classes/CreateImage.inc           |   863 -
 3rdparty/phpdocx/classes/CreateLink.inc            |   304 -
 3rdparty/phpdocx/classes/CreateList.inc            |   617 -
 3rdparty/phpdocx/classes/CreateMath.inc            |   144 -
 3rdparty/phpdocx/classes/CreatePage.inc            |   343 -
 3rdparty/phpdocx/classes/CreatePieChart.inc        |   210 -
 3rdparty/phpdocx/classes/CreateSettings.inc        |   113 -
 3rdparty/phpdocx/classes/CreateSimpleXlsx.inc      |   182 -
 3rdparty/phpdocx/classes/CreateStyle.inc           |  2755 --
 3rdparty/phpdocx/classes/CreateStyleTable.inc      |   648 -
 3rdparty/phpdocx/classes/CreateTable.inc           |  1141 -
 3rdparty/phpdocx/classes/CreateText.inc            |   687 -
 3rdparty/phpdocx/classes/CreateTheme1.inc          |  1258 -
 3rdparty/phpdocx/classes/CreateWebSettings.inc     |    93 -
 3rdparty/phpdocx/classes/CreateXlsx.inc            |   539 -
 3rdparty/phpdocx/classes/Debug.inc                 |   200 -
 3rdparty/phpdocx/classes/Docx2Text.inc             |   661 -
 3rdparty/phpdocx/classes/InterfaceGraphic.inc      |    36 -
 3rdparty/phpdocx/classes/InterfaceXlsx.inc         |    36 -
 3rdparty/phpdocx/classes/Parser.inc                |   112 -
 3rdparty/phpdocx/classes/PhpdocxLogger.inc         |    61 -
 3rdparty/phpdocx/classes/PhpdocxUtilities.inc      |    79 -
 3rdparty/phpdocx/classes/Phpdocx_config.inc        |   619 -
 3rdparty/phpdocx/classes/TransformDoc.inc          |   410 -
 3rdparty/phpdocx/classes/WordML.inc                |   116 -
 3rdparty/phpdocx/config/log4php.xml                |    31 -
 3rdparty/phpdocx/config/phpdocxconfig.ini          |    10 -
 3rdparty/phpdocx/excel/[Content_Types].xml         |     2 -
 3rdparty/phpdocx/excel/_rels/.rels                 |     2 -
 3rdparty/phpdocx/excel/docProps/app.xml            |     2 -
 3rdparty/phpdocx/excel/docProps/core.xml           |     2 -
 3rdparty/phpdocx/excel/excel.xlsx                  |   Bin 7160 -> 0 bytes
 3rdparty/phpdocx/excel/xl/_rels/workbook.xml.rels  |     2 -
 .../excel/xl/printerSettings/printerSettings1.bin  |   Bin 4824 -> 0 bytes
 3rdparty/phpdocx/excel/xl/sharedStrings.xml        |     2 -
 3rdparty/phpdocx/excel/xl/styles.xml               |     2 -
 3rdparty/phpdocx/excel/xl/tables/table1.xml        |     2 -
 3rdparty/phpdocx/excel/xl/theme/theme1.xml         |     2 -
 3rdparty/phpdocx/excel/xl/workbook.xml             |     2 -
 .../excel/xl/worksheets/_rels/sheet1.xml.rels      |     2 -
 3rdparty/phpdocx/excel/xl/worksheets/sheet1.xml    |     2 -
 3rdparty/phpdocx/lib/log4php/Logger.php            |   596 -
 3rdparty/phpdocx/lib/log4php/LoggerAppender.php    |   286 -
 .../phpdocx/lib/log4php/LoggerAppenderPool.php     |    98 -
 3rdparty/phpdocx/lib/log4php/LoggerAutoloader.php  |   142 -
 .../phpdocx/lib/log4php/LoggerConfigurable.php     |   116 -
 .../phpdocx/lib/log4php/LoggerConfigurator.php     |    42 -
 3rdparty/phpdocx/lib/log4php/LoggerException.php   |    28 -
 3rdparty/phpdocx/lib/log4php/LoggerFilter.php      |   126 -
 3rdparty/phpdocx/lib/log4php/LoggerHierarchy.php   |   257 -
 3rdparty/phpdocx/lib/log4php/LoggerLayout.php      |    74 -
 3rdparty/phpdocx/lib/log4php/LoggerLevel.php       |   256 -
 .../phpdocx/lib/log4php/LoggerLocationInfo.php     |   103 -
 .../phpdocx/lib/log4php/LoggerLoggingEvent.php     |   368 -
 3rdparty/phpdocx/lib/log4php/LoggerMDC.php         |    88 -
 3rdparty/phpdocx/lib/log4php/LoggerNDC.php         |   203 -
 .../phpdocx/lib/log4php/LoggerReflectionUtils.php  |   152 -
 3rdparty/phpdocx/lib/log4php/LoggerRoot.php        |    71 -
 .../lib/log4php/LoggerThrowableInformation.php     |    68 -
 .../log4php/appenders/LoggerAppenderConsole.php    |   103 -
 .../log4php/appenders/LoggerAppenderDailyFile.php  |   130 -
 .../lib/log4php/appenders/LoggerAppenderEcho.php   |    88 -
 .../lib/log4php/appenders/LoggerAppenderFile.php   |   225 -
 .../log4php/appenders/LoggerAppenderFirePHP.php    |   100 -
 .../lib/log4php/appenders/LoggerAppenderMail.php   |   136 -
 .../log4php/appenders/LoggerAppenderMailEvent.php  |   180 -
 .../log4php/appenders/LoggerAppenderMongoDB.php    |   360 -
 .../lib/log4php/appenders/LoggerAppenderNull.php   |    44 -
 .../lib/log4php/appenders/LoggerAppenderPDO.php    |   282 -
 .../lib/log4php/appenders/LoggerAppenderPhp.php    |    49 -
 .../appenders/LoggerAppenderRollingFile.php        |   305 -
 .../lib/log4php/appenders/LoggerAppenderSocket.php |   122 -
 .../lib/log4php/appenders/LoggerAppenderSyslog.php |   303 -
 .../configurators/LoggerConfigurationAdapter.php   |    39 -
 .../LoggerConfigurationAdapterINI.php              |   299 -
 .../LoggerConfigurationAdapterPHP.php              |    84 -
 .../LoggerConfigurationAdapterXML.php              |   278 -
 .../configurators/LoggerConfiguratorDefault.php    |   477 -
 .../lib/log4php/filters/LoggerFilterDenyAll.php    |    56 -
 .../lib/log4php/filters/LoggerFilterLevelMatch.php |   100 -
 .../lib/log4php/filters/LoggerFilterLevelRange.php |   138 -
 .../log4php/filters/LoggerFilterStringMatch.php    |    89 -
 .../lib/log4php/helpers/LoggerFormattingInfo.php   |    54 -
 .../lib/log4php/helpers/LoggerOptionConverter.php  |   226 -
 .../lib/log4php/helpers/LoggerPatternParser.php    |   237 -
 .../phpdocx/lib/log4php/helpers/LoggerUtils.php    |   123 -
 .../lib/log4php/layouts/LoggerLayoutHtml.php       |   214 -
 .../lib/log4php/layouts/LoggerLayoutPattern.php    |   171 -
 .../lib/log4php/layouts/LoggerLayoutSerialized.php |    55 -
 .../lib/log4php/layouts/LoggerLayoutSimple.php     |    56 -
 .../lib/log4php/layouts/LoggerLayoutTTCC.php       |   201 -
 .../lib/log4php/layouts/LoggerLayoutXml.php        |   210 -
 .../lib/log4php/pattern/LoggerPatternConverter.php |   131 -
 .../pattern/LoggerPatternConverterClass.php        |    64 -
 .../pattern/LoggerPatternConverterCookie.php       |    35 -
 .../log4php/pattern/LoggerPatternConverterDate.php |    91 -
 .../pattern/LoggerPatternConverterEnvironment.php  |    35 -
 .../log4php/pattern/LoggerPatternConverterFile.php |    34 -
 .../pattern/LoggerPatternConverterLevel.php        |    34 -
 .../log4php/pattern/LoggerPatternConverterLine.php |    35 -
 .../pattern/LoggerPatternConverterLiteral.php      |    40 -
 .../pattern/LoggerPatternConverterLocation.php     |    39 -
 .../pattern/LoggerPatternConverterLogger.php       |    65 -
 .../log4php/pattern/LoggerPatternConverterMDC.php  |    55 -
 .../pattern/LoggerPatternConverterMessage.php      |    34 -
 .../pattern/LoggerPatternConverterMethod.php       |    35 -
 .../log4php/pattern/LoggerPatternConverterNDC.php  |    35 -
 .../pattern/LoggerPatternConverterNewLine.php      |    34 -
 .../pattern/LoggerPatternConverterProcess.php      |    34 -
 .../pattern/LoggerPatternConverterRelative.php     |    36 -
 .../pattern/LoggerPatternConverterRequest.php      |    35 -
 .../pattern/LoggerPatternConverterServer.php       |    35 -
 .../pattern/LoggerPatternConverterSession.php      |    35 -
 .../pattern/LoggerPatternConverterSessionID.php    |    33 -
 .../pattern/LoggerPatternConverterSuperglobal.php  |   102 -
 .../pattern/LoggerPatternConverterThrowable.php    |    40 -
 .../lib/log4php/renderers/LoggerRenderer.php       |    36 -
 .../log4php/renderers/LoggerRendererDefault.php    |    36 -
 .../log4php/renderers/LoggerRendererException.php  |    36 -
 .../lib/log4php/renderers/LoggerRendererMap.php    |   186 -
 3rdparty/phpdocx/lib/log4php/xml/log4php.dtd       |   148 -
 3rdparty/phpdocx/pdf/LICENSE.LGPL                  |   456 -
 3rdparty/phpdocx/pdf/lib/class.pdf.php             |  4897 ---
 3rdparty/phpdocx/pdf/lib/fonts/Courier-Bold.afm    |   344 -
 .../phpdocx/pdf/lib/fonts/Courier-BoldOblique.afm  |   344 -
 3rdparty/phpdocx/pdf/lib/fonts/Courier-Oblique.afm |   344 -
 3rdparty/phpdocx/pdf/lib/fonts/Courier.afm         |   344 -
 3rdparty/phpdocx/pdf/lib/fonts/Helvetica-Bold.afm  |  2829 --
 .../pdf/lib/fonts/Helvetica-BoldOblique.afm        |  2829 --
 .../phpdocx/pdf/lib/fonts/Helvetica-Oblique.afm    |  3053 --
 3rdparty/phpdocx/pdf/lib/fonts/Helvetica.afm       |  3053 --
 3rdparty/phpdocx/pdf/lib/fonts/Symbol.afm          |   213 -
 3rdparty/phpdocx/pdf/lib/fonts/Times-Bold.afm      |  2590 --
 3rdparty/phpdocx/pdf/lib/fonts/Times-Bold.afm.php  |   570 -
 .../phpdocx/pdf/lib/fonts/Times-BoldItalic.afm     |  2386 --
 3rdparty/phpdocx/pdf/lib/fonts/Times-Italic.afm    |  2669 --
 3rdparty/phpdocx/pdf/lib/fonts/Times-Roman.afm     |  2421 --
 3rdparty/phpdocx/pdf/lib/fonts/Times-Roman.afm.php |   570 -
 3rdparty/phpdocx/pdf/lib/fonts/ZapfDingbats.afm    |   225 -
 .../lib/fonts/dompdf_font_family_cache.dist.php    |    92 -
 3rdparty/phpdocx/pdf/lib/fonts/log.htm             |     1 -
 3rdparty/phpdocx/pdf/lib/fonts/mustRead.html       |    17 -
 3rdparty/phpdocx/pdf/lib/res/broken_image.png      |   Bin 267 -> 0 bytes
 3rdparty/phpdocx/pdf/lib/res/html.css              |   427 -
 3rdparty/phpdocx/pdf/lib/ttf2ufm/README.TXT        |    24 -
 3rdparty/phpdocx/pdf/lib/ttf2ufm/bin/ttf2ufm.exe   |   Bin 355187 -> 0 bytes
 3rdparty/phpdocx/pdf/lib/ttf2ufm/src/CHANGES       |     0
 3rdparty/phpdocx/pdf/lib/ttf2ufm/src/CHANGES.html  |   815 -
 3rdparty/phpdocx/pdf/lib/ttf2ufm/src/COPYRIGHT     |    87 -
 3rdparty/phpdocx/pdf/lib/ttf2ufm/src/FONTS         |   462 -
 3rdparty/phpdocx/pdf/lib/ttf2ufm/src/FONTS.hpux    |   107 -
 .../phpdocx/pdf/lib/ttf2ufm/src/FONTS.hpux.html    |   197 -
 3rdparty/phpdocx/pdf/lib/ttf2ufm/src/FONTS.html    |   708 -
 3rdparty/phpdocx/pdf/lib/ttf2ufm/src/Makefile      |   279 -
 3rdparty/phpdocx/pdf/lib/ttf2ufm/src/README        |   814 -
 3rdparty/phpdocx/pdf/lib/ttf2ufm/src/README.FIRST  |     4 -
 3rdparty/phpdocx/pdf/lib/ttf2ufm/src/README.html   |  1182 -
 .../phpdocx/pdf/lib/ttf2ufm/src/app/RPM/Makefile   |   279 -
 .../pdf/lib/ttf2ufm/src/app/RPM/ttf2pt1.spec       |    40 -
 .../pdf/lib/ttf2ufm/src/app/RPM/ttf2pt1.spec.src   |    40 -
 .../phpdocx/pdf/lib/ttf2ufm/src/app/TeX/README     |    51 -
 .../pdf/lib/ttf2ufm/src/app/TeX/README.html        |    80 -
 .../pdf/lib/ttf2ufm/src/app/TeX/cjk-latex-config   |   352 -
 .../pdf/lib/ttf2ufm/src/app/TeX/cjk-latex-t1mapgen |    60 -
 .../phpdocx/pdf/lib/ttf2ufm/src/app/TeX/sfd2map    |    68 -
 .../phpdocx/pdf/lib/ttf2ufm/src/app/X11/README     |    24 -
 .../pdf/lib/ttf2ufm/src/app/X11/README.html        |    41 -
 .../pdf/lib/ttf2ufm/src/app/X11/t1-xf86.334.patch  |   199 -
 .../pdf/lib/ttf2ufm/src/app/X11/t1-xf86.39.patch   |   252 -
 .../pdf/lib/ttf2ufm/src/app/netscape/Makefile      |     5 -
 .../pdf/lib/ttf2ufm/src/app/netscape/README        |   180 -
 .../pdf/lib/ttf2ufm/src/app/netscape/README.html   |   242 -
 .../pdf/lib/ttf2ufm/src/app/netscape/fontsz.cf     |     8 -
 .../pdf/lib/ttf2ufm/src/app/netscape/notscape      |    25 -
 .../pdf/lib/ttf2ufm/src/app/netscape/nsfilter      |    24 -
 .../pdf/lib/ttf2ufm/src/app/netscape/nsfix.c       |   469 -
 .../phpdocx/pdf/lib/ttf2ufm/src/app/netscape/nspr  |    26 -
 .../pdf/lib/ttf2ufm/src/app/netscape/nsprint       |    10 -
 .../pdf/lib/ttf2ufm/src/app/netscape/psfonts.cf    |    11 -
 3rdparty/phpdocx/pdf/lib/ttf2ufm/src/bdf.c         |   661 -
 3rdparty/phpdocx/pdf/lib/ttf2ufm/src/bitmap.c      |  2633 --
 3rdparty/phpdocx/pdf/lib/ttf2ufm/src/byteorder.h   |    24 -
 3rdparty/phpdocx/pdf/lib/ttf2ufm/src/cygbuild.sh   |     8 -
 .../phpdocx/pdf/lib/ttf2ufm/src/encodings/README   |    47 -
 .../pdf/lib/ttf2ufm/src/encodings/README.html      |    81 -
 .../ttf2ufm/src/encodings/adobestd/adobe-std.tbl   |     0
 .../pdf/lib/ttf2ufm/src/encodings/bulgarian/README |     3 -
 .../src/encodings/bulgarian/encodings.alias        |     4 -
 .../ttf2ufm/src/encodings/bulgarian/ibm-1251.tbl   |   127 -
 .../ttf2ufm/src/encodings/bulgarian/ibm-866.tbl    |   128 -
 .../ttf2ufm/src/encodings/bulgarian/iso8859-5.tbl  |   127 -
 .../lib/ttf2ufm/src/encodings/bulgarian/koi8-r.tbl |   128 -
 .../ttf2ufm/src/encodings/cyrillic/encodings.alias |     4 -
 .../ttf2ufm/src/encodings/cyrillic/ibm-1251.tbl    |   127 -
 .../lib/ttf2ufm/src/encodings/cyrillic/ibm-866.tbl |   128 -
 .../ttf2ufm/src/encodings/cyrillic/iso8859-5.tbl   |   127 -
 .../lib/ttf2ufm/src/encodings/cyrillic/koi8-r.tbl  |   128 -
 .../lib/ttf2ufm/src/encodings/latin1/iso8859-1.tbl |     0
 .../lib/ttf2ufm/src/encodings/latin2/iso8859-2.tbl |     0
 .../pdf/lib/ttf2ufm/src/encodings/latin4/iso8859-4 |     0
 .../lib/ttf2ufm/src/encodings/latin4/iso8859-4.tbl |     0
 .../pdf/lib/ttf2ufm/src/encodings/latin5/iso8859-9 |     0
 .../pdf/lib/ttf2ufm/src/encodings/russian/README   |     3 -
 .../ttf2ufm/src/encodings/russian/encodings.alias  |     4 -
 .../lib/ttf2ufm/src/encodings/russian/ibm-1251.tbl |   127 -
 .../lib/ttf2ufm/src/encodings/russian/ibm-866.tbl  |   128 -
 .../ttf2ufm/src/encodings/russian/iso8859-5.tbl    |   127 -
 .../lib/ttf2ufm/src/encodings/russian/koi8-r.tbl   |   128 -
 3rdparty/phpdocx/pdf/lib/ttf2ufm/src/ft.c          |   649 -
 3rdparty/phpdocx/pdf/lib/ttf2ufm/src/global.h      |   173 -
 .../phpdocx/pdf/lib/ttf2ufm/src/maps/CP1250.map    |   254 -
 .../phpdocx/pdf/lib/ttf2ufm/src/maps/CP1251.map    |   245 -
 .../pdf/lib/ttf2ufm/src/maps/T2A_compact.map       |   111 -
 .../ttf2ufm/src/maps/adobe-standard-encoding.map   |   231 -
 .../phpdocx/pdf/lib/ttf2ufm/src/maps/cubg5plus.map |  3184 --
 .../phpdocx/pdf/lib/ttf2ufm/src/maps/cubig5.map    |  1861 --
 3rdparty/phpdocx/pdf/lib/ttf2ufm/src/maps/cugb.map |  1181 -
 .../phpdocx/pdf/lib/ttf2ufm/src/maps/cugbk.map     |  3185 --
 .../phpdocx/pdf/lib/ttf2ufm/src/maps/ubig5.map     |  2184 --
 3rdparty/phpdocx/pdf/lib/ttf2ufm/src/maps/ugb.map  |  1236 -
 3rdparty/phpdocx/pdf/lib/ttf2ufm/src/maps/ugbk.map |  3295 --
 .../pdf/lib/ttf2ufm/src/maps/unicode-sample.map    |   158 -
 .../phpdocx/pdf/lib/ttf2ufm/src/other/Makefile     |    20 -
 3rdparty/phpdocx/pdf/lib/ttf2ufm/src/other/README  |   127 -
 .../phpdocx/pdf/lib/ttf2ufm/src/other/README.html  |   176 -
 .../phpdocx/pdf/lib/ttf2ufm/src/other/bmpfont.h    |   338 -
 3rdparty/phpdocx/pdf/lib/ttf2ufm/src/other/bz.c    |    78 -
 .../phpdocx/pdf/lib/ttf2ufm/src/other/bzscreen.c   |   220 -
 .../phpdocx/pdf/lib/ttf2ufm/src/other/bzscreen.h   |    40 -
 3rdparty/phpdocx/pdf/lib/ttf2ufm/src/other/cmpf.c  |    67 -
 .../phpdocx/pdf/lib/ttf2ufm/src/other/cntstems.pl  |    50 -
 3rdparty/phpdocx/pdf/lib/ttf2ufm/src/other/dmpf.c  |    53 -
 3rdparty/phpdocx/pdf/lib/ttf2ufm/src/other/lst.pl  |    65 -
 3rdparty/phpdocx/pdf/lib/ttf2ufm/src/other/showdf  |    58 -
 3rdparty/phpdocx/pdf/lib/ttf2ufm/src/other/showg   |   633 -
 3rdparty/phpdocx/pdf/lib/ttf2ufm/src/pt1.c         |  7390 -----
 3rdparty/phpdocx/pdf/lib/ttf2ufm/src/pt1.h         |   262 -
 3rdparty/phpdocx/pdf/lib/ttf2ufm/src/runt1asm.c    |    61 -
 .../phpdocx/pdf/lib/ttf2ufm/src/scripts/convert    |   367 -
 .../pdf/lib/ttf2ufm/src/scripts/convert.cfg.sample |   192 -
 .../phpdocx/pdf/lib/ttf2ufm/src/scripts/forceiso   |   450 -
 .../phpdocx/pdf/lib/ttf2ufm/src/scripts/frommap    |    24 -
 .../phpdocx/pdf/lib/ttf2ufm/src/scripts/html2man   |   231 -
 .../phpdocx/pdf/lib/ttf2ufm/src/scripts/inst_dir   |    43 -
 .../phpdocx/pdf/lib/ttf2ufm/src/scripts/inst_file  |    17 -
 3rdparty/phpdocx/pdf/lib/ttf2ufm/src/scripts/mkrel |   104 -
 .../phpdocx/pdf/lib/ttf2ufm/src/scripts/t1fdir     |   227 -
 3rdparty/phpdocx/pdf/lib/ttf2ufm/src/scripts/trans |   164 -
 .../phpdocx/pdf/lib/ttf2ufm/src/scripts/unhtml     |    22 -
 3rdparty/phpdocx/pdf/lib/ttf2ufm/src/scripts/x2gs  |   118 -
 3rdparty/phpdocx/pdf/lib/ttf2ufm/src/t1asm.c       |   604 -
 3rdparty/phpdocx/pdf/lib/ttf2ufm/src/ttf.c         |  1502 -
 3rdparty/phpdocx/pdf/lib/ttf2ufm/src/ttf.h         |   172 -
 3rdparty/phpdocx/pdf/lib/ttf2ufm/src/ttf2pt1.1     |   822 -
 3rdparty/phpdocx/pdf/lib/ttf2ufm/src/ttf2pt1.c     |  2694 --
 .../phpdocx/pdf/lib/ttf2ufm/src/ttf2pt1_convert.1  |   506 -
 .../phpdocx/pdf/lib/ttf2ufm/src/ttf2pt1_x2gs.1     |   313 -
 3rdparty/phpdocx/pdf/lib/ttf2ufm/src/ttf2ufm       |   Bin 325617 -> 0 bytes
 3rdparty/phpdocx/pdf/lib/ttf2ufm/src/version.h     |     7 -
 3rdparty/phpdocx/pdf/lib/ttf2ufm/src/winbuild.bat  |    11 -
 3rdparty/phpdocx/pdf/lib/ttf2ufm/src/windows.h     |    93 -
 3rdparty/phpdocx/pdf/load_font.php                 |   227 -
 3rdparty/phpdocx/pdf/tcpdf/2dbarcodes.php          |   172 -
 3rdparty/phpdocx/pdf/tcpdf/CHANGELOG.TXT           |  1931 --
 3rdparty/phpdocx/pdf/tcpdf/LICENSE.TXT             |   860 -
 3rdparty/phpdocx/pdf/tcpdf/README.TXT              |    90 -
 3rdparty/phpdocx/pdf/tcpdf/barcodes.php            |  1965 --
 .../phpdocx/pdf/tcpdf/cache/chapter_demo_1.txt     |    19 -
 .../phpdocx/pdf/tcpdf/cache/chapter_demo_2.txt     |    23 -
 .../phpdocx/pdf/tcpdf/cache/table_data_demo.txt    |    15 -
 3rdparty/phpdocx/pdf/tcpdf/cache/utf8test.txt      |   122 -
 3rdparty/phpdocx/pdf/tcpdf/config/lang/afr.php     |    47 -
 3rdparty/phpdocx/pdf/tcpdf/config/lang/ara.php     |    47 -
 3rdparty/phpdocx/pdf/tcpdf/config/lang/aze.php     |    47 -
 3rdparty/phpdocx/pdf/tcpdf/config/lang/bel.php     |    47 -
 3rdparty/phpdocx/pdf/tcpdf/config/lang/bra.php     |    47 -
 3rdparty/phpdocx/pdf/tcpdf/config/lang/cat.php     |    47 -
 3rdparty/phpdocx/pdf/tcpdf/config/lang/ces.php     |    47 -
 3rdparty/phpdocx/pdf/tcpdf/config/lang/chi.php     |    47 -
 3rdparty/phpdocx/pdf/tcpdf/config/lang/cym.php     |    47 -
 3rdparty/phpdocx/pdf/tcpdf/config/lang/dan.php     |    47 -
 3rdparty/phpdocx/pdf/tcpdf/config/lang/eng.php     |    47 -
 3rdparty/phpdocx/pdf/tcpdf/config/lang/est.php     |    47 -
 3rdparty/phpdocx/pdf/tcpdf/config/lang/eus.php     |    47 -
 3rdparty/phpdocx/pdf/tcpdf/config/lang/fra.php     |    47 -
 3rdparty/phpdocx/pdf/tcpdf/config/lang/ger.php     |    47 -
 3rdparty/phpdocx/pdf/tcpdf/config/lang/gle.php     |    47 -
 3rdparty/phpdocx/pdf/tcpdf/config/lang/glg.php     |    47 -
 3rdparty/phpdocx/pdf/tcpdf/config/lang/hat.php     |    47 -
 3rdparty/phpdocx/pdf/tcpdf/config/lang/heb.php     |    47 -
 3rdparty/phpdocx/pdf/tcpdf/config/lang/hrv.php     |    47 -
 3rdparty/phpdocx/pdf/tcpdf/config/lang/hun.php     |    47 -
 3rdparty/phpdocx/pdf/tcpdf/config/lang/hye.php     |    47 -
 3rdparty/phpdocx/pdf/tcpdf/config/lang/ind.php     |    47 -
 3rdparty/phpdocx/pdf/tcpdf/config/lang/ita.php     |    47 -
 3rdparty/phpdocx/pdf/tcpdf/config/lang/kat.php     |    47 -
 3rdparty/phpdocx/pdf/tcpdf/config/lang/kor.php     |    47 -
 3rdparty/phpdocx/pdf/tcpdf/config/lang/mkd.php     |    47 -
 3rdparty/phpdocx/pdf/tcpdf/config/lang/mlt.php     |    47 -
 3rdparty/phpdocx/pdf/tcpdf/config/lang/msa.php     |    47 -
 3rdparty/phpdocx/pdf/tcpdf/config/lang/nld.php     |    47 -
 3rdparty/phpdocx/pdf/tcpdf/config/lang/nob.php     |    47 -
 3rdparty/phpdocx/pdf/tcpdf/config/lang/pol.php     |    47 -
 3rdparty/phpdocx/pdf/tcpdf/config/lang/por.php     |    47 -
 3rdparty/phpdocx/pdf/tcpdf/config/lang/ron.php     |    47 -
 3rdparty/phpdocx/pdf/tcpdf/config/lang/rus.php     |    47 -
 3rdparty/phpdocx/pdf/tcpdf/config/lang/slv.php     |    47 -
 3rdparty/phpdocx/pdf/tcpdf/config/lang/spa.php     |    47 -
 3rdparty/phpdocx/pdf/tcpdf/config/lang/sqi.php     |    47 -
 3rdparty/phpdocx/pdf/tcpdf/config/lang/srp.php     |    47 -
 3rdparty/phpdocx/pdf/tcpdf/config/lang/swa.php     |    47 -
 3rdparty/phpdocx/pdf/tcpdf/config/lang/swe.php     |    47 -
 3rdparty/phpdocx/pdf/tcpdf/config/lang/urd.php     |    47 -
 3rdparty/phpdocx/pdf/tcpdf/config/lang/yid.php     |    47 -
 3rdparty/phpdocx/pdf/tcpdf/config/lang/zho.php     |    47 -
 3rdparty/phpdocx/pdf/tcpdf/config/tcpdf_config.php |   240 -
 .../phpdocx/pdf/tcpdf/config/tcpdf_config_alt.php  |   234 -
 3rdparty/phpdocx/pdf/tcpdf/doc/index.html          |    11 -
 .../phpdocx/pdf/tcpdf/examples/example_001.php     |   102 -
 .../phpdocx/pdf/tcpdf/examples/example_002.php     |    87 -
 .../phpdocx/pdf/tcpdf/examples/example_003.php     |   118 -
 .../phpdocx/pdf/tcpdf/examples/example_004.php     |   121 -
 .../phpdocx/pdf/tcpdf/examples/example_005.php     |   158 -
 .../phpdocx/pdf/tcpdf/examples/example_006.php     |   332 -
 .../phpdocx/pdf/tcpdf/examples/example_007.php     |   113 -
 .../phpdocx/pdf/tcpdf/examples/example_008.php     |    94 -
 .../phpdocx/pdf/tcpdf/examples/example_009.php     |   146 -
 .../phpdocx/pdf/tcpdf/examples/example_010.php     |   152 -
 .../phpdocx/pdf/tcpdf/examples/example_011.php     |   138 -
 .../phpdocx/pdf/tcpdf/examples/example_012.php     |   205 -
 .../phpdocx/pdf/tcpdf/examples/example_013.php     |   229 -
 .../phpdocx/pdf/tcpdf/examples/example_014.php     |   190 -
 .../phpdocx/pdf/tcpdf/examples/example_015.php     |   121 -
 .../phpdocx/pdf/tcpdf/examples/example_016.php     |   134 -
 .../phpdocx/pdf/tcpdf/examples/example_017.php     |   117 -
 .../phpdocx/pdf/tcpdf/examples/example_018.php     |   132 -
 .../phpdocx/pdf/tcpdf/examples/example_019.php     |   106 -
 .../phpdocx/pdf/tcpdf/examples/example_020.php     |   146 -
 .../phpdocx/pdf/tcpdf/examples/example_021.php     |    91 -
 .../phpdocx/pdf/tcpdf/examples/example_022.php     |   146 -
 .../phpdocx/pdf/tcpdf/examples/example_023.php     |   113 -
 .../phpdocx/pdf/tcpdf/examples/example_024.php     |   118 -
 .../phpdocx/pdf/tcpdf/examples/example_025.php     |   118 -
 .../phpdocx/pdf/tcpdf/examples/example_026.php     |   145 -
 .../phpdocx/pdf/tcpdf/examples/example_027.php     |   403 -
 .../phpdocx/pdf/tcpdf/examples/example_028.php     |   138 -
 .../phpdocx/pdf/tcpdf/examples/example_029.php     |   124 -
 .../phpdocx/pdf/tcpdf/examples/example_030.php     |   188 -
 .../phpdocx/pdf/tcpdf/examples/example_031.php     |   103 -
 .../phpdocx/pdf/tcpdf/examples/example_032.php     |    93 -
 .../phpdocx/pdf/tcpdf/examples/example_033.php     |   102 -
 .../phpdocx/pdf/tcpdf/examples/example_034.php     |    96 -
 .../phpdocx/pdf/tcpdf/examples/example_035.php     |   111 -
 .../phpdocx/pdf/tcpdf/examples/example_036.php     |    89 -
 .../phpdocx/pdf/tcpdf/examples/example_037.php     |   202 -
 .../phpdocx/pdf/tcpdf/examples/example_038.php     |    87 -
 .../phpdocx/pdf/tcpdf/examples/example_039.php     |   104 -
 .../phpdocx/pdf/tcpdf/examples/example_040.php     |   116 -
 .../phpdocx/pdf/tcpdf/examples/example_041.php     |    90 -
 .../phpdocx/pdf/tcpdf/examples/example_042.php     |   102 -
 .../phpdocx/pdf/tcpdf/examples/example_043.php     |    85 -
 .../phpdocx/pdf/tcpdf/examples/example_044.php     |   128 -
 .../phpdocx/pdf/tcpdf/examples/example_045.php     |   130 -
 .../phpdocx/pdf/tcpdf/examples/example_046.php     |   123 -
 .../phpdocx/pdf/tcpdf/examples/example_047.php     |   117 -
 .../phpdocx/pdf/tcpdf/examples/example_048.php     |   313 -
 .../phpdocx/pdf/tcpdf/examples/example_049.php     |   126 -
 .../phpdocx/pdf/tcpdf/examples/example_050.php     |   205 -
 .../phpdocx/pdf/tcpdf/examples/example_051.php     |   111 -
 .../phpdocx/pdf/tcpdf/examples/example_052.php     |   115 -
 .../phpdocx/pdf/tcpdf/examples/example_053.php     |   108 -
 .../phpdocx/pdf/tcpdf/examples/example_054.php     |   128 -
 .../phpdocx/pdf/tcpdf/examples/example_055.php     |   115 -
 .../phpdocx/pdf/tcpdf/examples/example_056.php     |   117 -
 .../phpdocx/pdf/tcpdf/examples/example_057.php     |   268 -
 .../phpdocx/pdf/tcpdf/examples/example_058.php     |    94 -
 .../phpdocx/pdf/tcpdf/examples/example_059.php     |   189 -
 .../phpdocx/pdf/tcpdf/examples/example_060.php     |   108 -
 .../phpdocx/pdf/tcpdf/examples/example_061.php     |   273 -
 .../phpdocx/pdf/tcpdf/examples/example_062.php     |   136 -
 .../phpdocx/pdf/tcpdf/examples/example_063.php     |   131 -
 .../phpdocx/pdf/tcpdf/examples/example_064.php     |   176 -
 3rdparty/phpdocx/pdf/tcpdf/examples/index.php      |    88 -
 3rdparty/phpdocx/pdf/tcpdf/fonts/README.TXT        |     3 -
 3rdparty/phpdocx/pdf/tcpdf/fonts/almohanad.ctg.z   |   Bin 2780 -> 0 bytes
 3rdparty/phpdocx/pdf/tcpdf/fonts/almohanad.php     |   102 -
 3rdparty/phpdocx/pdf/tcpdf/fonts/almohanad.z       |   Bin 121292 -> 0 bytes
 3rdparty/phpdocx/pdf/tcpdf/fonts/arialunicid0.php  |  1769 --
 3rdparty/phpdocx/pdf/tcpdf/fonts/chinese.php       |    15 -
 3rdparty/phpdocx/pdf/tcpdf/fonts/courier.php       |    33 -
 .../pdf/tcpdf/fonts/dejavu-fonts-ttf-2.32/AUTHORS  |    48 -
 .../pdf/tcpdf/fonts/dejavu-fonts-ttf-2.32/BUGS     |     3 -
 .../pdf/tcpdf/fonts/dejavu-fonts-ttf-2.32/LICENSE  |    99 -
 .../pdf/tcpdf/fonts/dejavu-fonts-ttf-2.32/NEWS     |  1250 -
 .../pdf/tcpdf/fonts/dejavu-fonts-ttf-2.32/README   |    59 -
 .../fonts/dejavu-fonts-ttf-2.32/langcover.txt      |   244 -
 .../tcpdf/fonts/dejavu-fonts-ttf-2.32/status.txt   |  6469 ----
 .../tcpdf/fonts/dejavu-fonts-ttf-2.32/unicover.txt |   203 -
 3rdparty/phpdocx/pdf/tcpdf/fonts/dejavusans.ctg.z  |   Bin 10030 -> 0 bytes
 3rdparty/phpdocx/pdf/tcpdf/fonts/dejavusans.php    |   531 -
 3rdparty/phpdocx/pdf/tcpdf/fonts/dejavusans.z      |   Bin 347072 -> 0 bytes
 3rdparty/phpdocx/pdf/tcpdf/fonts/dejavusansb.ctg.z |   Bin 9784 -> 0 bytes
 3rdparty/phpdocx/pdf/tcpdf/fonts/dejavusansb.php   |   518 -
 3rdparty/phpdocx/pdf/tcpdf/fonts/dejavusansb.z     |   Bin 318072 -> 0 bytes
 .../phpdocx/pdf/tcpdf/fonts/dejavusansbi.ctg.z     |   Bin 8680 -> 0 bytes
 3rdparty/phpdocx/pdf/tcpdf/fonts/dejavusansbi.php  |   464 -
 3rdparty/phpdocx/pdf/tcpdf/fonts/dejavusansbi.z    |   Bin 297277 -> 0 bytes
 .../pdf/tcpdf/fonts/dejavusanscondensed.ctg.z      |   Bin 10030 -> 0 bytes
 .../pdf/tcpdf/fonts/dejavusanscondensed.php        |   531 -
 .../phpdocx/pdf/tcpdf/fonts/dejavusanscondensed.z  |   Bin 298138 -> 0 bytes
 .../pdf/tcpdf/fonts/dejavusanscondensedb.ctg.z     |   Bin 9784 -> 0 bytes
 .../pdf/tcpdf/fonts/dejavusanscondensedb.php       |   518 -
 .../phpdocx/pdf/tcpdf/fonts/dejavusanscondensedb.z |   Bin 296635 -> 0 bytes
 .../pdf/tcpdf/fonts/dejavusanscondensedbi.ctg.z    |   Bin 8680 -> 0 bytes
 .../pdf/tcpdf/fonts/dejavusanscondensedbi.php      |   464 -
 .../pdf/tcpdf/fonts/dejavusanscondensedbi.z        |   Bin 283788 -> 0 bytes
 .../pdf/tcpdf/fonts/dejavusanscondensedi.ctg.z     |   Bin 8915 -> 0 bytes
 .../pdf/tcpdf/fonts/dejavusanscondensedi.php       |   477 -
 .../phpdocx/pdf/tcpdf/fonts/dejavusanscondensedi.z |   Bin 279483 -> 0 bytes
 .../pdf/tcpdf/fonts/dejavusansextralight.ctg.z     |   Bin 3718 -> 0 bytes
 .../pdf/tcpdf/fonts/dejavusansextralight.php       |   197 -
 .../phpdocx/pdf/tcpdf/fonts/dejavusansextralight.z |   Bin 158653 -> 0 bytes
 3rdparty/phpdocx/pdf/tcpdf/fonts/dejavusansi.ctg.z |   Bin 8915 -> 0 bytes
 3rdparty/phpdocx/pdf/tcpdf/fonts/dejavusansi.php   |   477 -
 3rdparty/phpdocx/pdf/tcpdf/fonts/dejavusansi.z     |   Bin 296396 -> 0 bytes
 .../phpdocx/pdf/tcpdf/fonts/dejavusansmono.ctg.z   |   Bin 6076 -> 0 bytes
 .../phpdocx/pdf/tcpdf/fonts/dejavusansmono.php     |   322 -
 3rdparty/phpdocx/pdf/tcpdf/fonts/dejavusansmono.z  |   Bin 189401 -> 0 bytes
 .../phpdocx/pdf/tcpdf/fonts/dejavusansmonob.ctg.z  |   Bin 5857 -> 0 bytes
 .../phpdocx/pdf/tcpdf/fonts/dejavusansmonob.php    |   309 -
 3rdparty/phpdocx/pdf/tcpdf/fonts/dejavusansmonob.z |   Bin 182372 -> 0 bytes
 .../phpdocx/pdf/tcpdf/fonts/dejavusansmonobi.ctg.z |   Bin 4723 -> 0 bytes
 .../phpdocx/pdf/tcpdf/fonts/dejavusansmonobi.php   |   252 -
 .../phpdocx/pdf/tcpdf/fonts/dejavusansmonobi.z     |   Bin 134815 -> 0 bytes
 .../phpdocx/pdf/tcpdf/fonts/dejavusansmonoi.ctg.z  |   Bin 4963 -> 0 bytes
 .../phpdocx/pdf/tcpdf/fonts/dejavusansmonoi.php    |   264 -
 3rdparty/phpdocx/pdf/tcpdf/fonts/dejavusansmonoi.z |   Bin 136621 -> 0 bytes
 3rdparty/phpdocx/pdf/tcpdf/fonts/dejavuserif.ctg.z |   Bin 5973 -> 0 bytes
 3rdparty/phpdocx/pdf/tcpdf/fonts/dejavuserif.php   |   323 -
 3rdparty/phpdocx/pdf/tcpdf/fonts/dejavuserif.z     |   Bin 185864 -> 0 bytes
 .../phpdocx/pdf/tcpdf/fonts/dejavuserifb.ctg.z     |   Bin 5717 -> 0 bytes
 3rdparty/phpdocx/pdf/tcpdf/fonts/dejavuserifb.php  |   309 -
 3rdparty/phpdocx/pdf/tcpdf/fonts/dejavuserifb.z    |   Bin 171017 -> 0 bytes
 .../phpdocx/pdf/tcpdf/fonts/dejavuserifbi.ctg.z    |   Bin 5724 -> 0 bytes
 3rdparty/phpdocx/pdf/tcpdf/fonts/dejavuserifbi.php |   309 -
 3rdparty/phpdocx/pdf/tcpdf/fonts/dejavuserifbi.z   |   Bin 169327 -> 0 bytes
 .../pdf/tcpdf/fonts/dejavuserifcondensed.ctg.z     |   Bin 5973 -> 0 bytes
 .../pdf/tcpdf/fonts/dejavuserifcondensed.php       |   323 -
 .../phpdocx/pdf/tcpdf/fonts/dejavuserifcondensed.z |   Bin 165227 -> 0 bytes
 .../pdf/tcpdf/fonts/dejavuserifcondensedb.ctg.z    |   Bin 5717 -> 0 bytes
 .../pdf/tcpdf/fonts/dejavuserifcondensedb.php      |   309 -
 .../pdf/tcpdf/fonts/dejavuserifcondensedb.z        |   Bin 155642 -> 0 bytes
 .../pdf/tcpdf/fonts/dejavuserifcondensedbi.ctg.z   |   Bin 5724 -> 0 bytes
 .../pdf/tcpdf/fonts/dejavuserifcondensedbi.php     |   309 -
 .../pdf/tcpdf/fonts/dejavuserifcondensedbi.z       |   Bin 170779 -> 0 bytes
 .../pdf/tcpdf/fonts/dejavuserifcondensedi.ctg.z    |   Bin 5949 -> 0 bytes
 .../pdf/tcpdf/fonts/dejavuserifcondensedi.php      |   322 -
 .../pdf/tcpdf/fonts/dejavuserifcondensedi.z        |   Bin 173141 -> 0 bytes
 .../phpdocx/pdf/tcpdf/fonts/dejavuserifi.ctg.z     |   Bin 5949 -> 0 bytes
 3rdparty/phpdocx/pdf/tcpdf/fonts/dejavuserifi.php  |   322 -
 3rdparty/phpdocx/pdf/tcpdf/fonts/dejavuserifi.z    |   Bin 171334 -> 0 bytes
 3rdparty/phpdocx/pdf/tcpdf/fonts/helvetica.php     |    33 -
 3rdparty/phpdocx/pdf/tcpdf/fonts/helveticab.php    |    33 -
 3rdparty/phpdocx/pdf/tcpdf/fonts/helveticabi.php   |    33 -
 3rdparty/phpdocx/pdf/tcpdf/fonts/helveticai.php    |    33 -
 .../pdf/tcpdf/fonts/hysmyeongjostdmedium.php       |    48 -
 .../phpdocx/pdf/tcpdf/fonts/kozgopromedium.php     |    65 -
 .../phpdocx/pdf/tcpdf/fonts/kozminproregular.php   |    63 -
 3rdparty/phpdocx/pdf/tcpdf/fonts/msungstdlight.php |    38 -
 .../phpdocx/pdf/tcpdf/fonts/stsongstdlight.php     |    39 -
 3rdparty/phpdocx/pdf/tcpdf/fonts/symbol.php        |    32 -
 3rdparty/phpdocx/pdf/tcpdf/fonts/times.php         |    33 -
 3rdparty/phpdocx/pdf/tcpdf/fonts/timesb.php        |    33 -
 3rdparty/phpdocx/pdf/tcpdf/fonts/timesbi.php       |    33 -
 3rdparty/phpdocx/pdf/tcpdf/fonts/timesi.php        |    33 -
 3rdparty/phpdocx/pdf/tcpdf/fonts/uni2cid_ac15.php  | 23613 ---------------
 3rdparty/phpdocx/pdf/tcpdf/fonts/uni2cid_ag15.php  | 30222 -------------------
 3rdparty/phpdocx/pdf/tcpdf/fonts/uni2cid_aj16.php  | 15705 ----------
 3rdparty/phpdocx/pdf/tcpdf/fonts/uni2cid_ak12.php  | 17530 -----------
 3rdparty/phpdocx/pdf/tcpdf/fonts/utils/README.TXT  |   135 -
 .../phpdocx/pdf/tcpdf/fonts/utils/enc/cp1250.map   |   251 -
 .../phpdocx/pdf/tcpdf/fonts/utils/enc/cp1251.map   |   255 -
 .../phpdocx/pdf/tcpdf/fonts/utils/enc/cp1252.map   |   251 -
 .../phpdocx/pdf/tcpdf/fonts/utils/enc/cp1253.map   |   239 -
 .../phpdocx/pdf/tcpdf/fonts/utils/enc/cp1254.map   |   249 -
 .../phpdocx/pdf/tcpdf/fonts/utils/enc/cp1255.map   |   233 -
 .../phpdocx/pdf/tcpdf/fonts/utils/enc/cp1257.map   |   244 -
 .../phpdocx/pdf/tcpdf/fonts/utils/enc/cp1258.map   |   247 -
 .../phpdocx/pdf/tcpdf/fonts/utils/enc/cp874.map    |   225 -
 .../pdf/tcpdf/fonts/utils/enc/iso-8859-1.map       |   256 -
 .../pdf/tcpdf/fonts/utils/enc/iso-8859-11.map      |   248 -
 .../pdf/tcpdf/fonts/utils/enc/iso-8859-15.map      |   256 -
 .../pdf/tcpdf/fonts/utils/enc/iso-8859-16.map      |   256 -
 .../pdf/tcpdf/fonts/utils/enc/iso-8859-2.map       |   256 -
 .../pdf/tcpdf/fonts/utils/enc/iso-8859-4.map       |   256 -
 .../pdf/tcpdf/fonts/utils/enc/iso-8859-5.map       |   256 -
 .../pdf/tcpdf/fonts/utils/enc/iso-8859-7.map       |   250 -
 .../pdf/tcpdf/fonts/utils/enc/iso-8859-9.map       |   256 -
 .../phpdocx/pdf/tcpdf/fonts/utils/enc/koi8-r.map   |   256 -
 .../phpdocx/pdf/tcpdf/fonts/utils/enc/koi8-u.map   |   256 -
 .../pdf/tcpdf/fonts/utils/makeallttffonts.php      |    79 -
 .../phpdocx/pdf/tcpdf/fonts/utils/makefont.php     |   621 -
 3rdparty/phpdocx/pdf/tcpdf/fonts/utils/pfm2afm     |   Bin 20031 -> 0 bytes
 3rdparty/phpdocx/pdf/tcpdf/fonts/utils/pfm2afm.exe |   Bin 22891 -> 0 bytes
 .../pdf/tcpdf/fonts/utils/src/pfm2afm-src.tar.gz   |   Bin 21325 -> 0 bytes
 .../phpdocx/pdf/tcpdf/fonts/utils/src/readme.txt   |    17 -
 .../pdf/tcpdf/fonts/utils/src/ttf2ufm-src.tar.gz   |   Bin 714480 -> 0 bytes
 3rdparty/phpdocx/pdf/tcpdf/fonts/utils/ttf2ufm     |   Bin 157374 -> 0 bytes
 3rdparty/phpdocx/pdf/tcpdf/fonts/utils/ttf2ufm.exe |   Bin 184320 -> 0 bytes
 3rdparty/phpdocx/pdf/tcpdf/fonts/zapfdingbats.php  |    32 -
 3rdparty/phpdocx/pdf/tcpdf/fonts/zarbold.ctg.z     |   Bin 1107 -> 0 bytes
 3rdparty/phpdocx/pdf/tcpdf/fonts/zarbold.php       |    47 -
 3rdparty/phpdocx/pdf/tcpdf/fonts/zarbold.z         |   Bin 32143 -> 0 bytes
 3rdparty/phpdocx/pdf/tcpdf/htmlcolors.php          |   199 -
 3rdparty/phpdocx/pdf/tcpdf/images/_blank.png       |   Bin 137 -> 0 bytes
 3rdparty/phpdocx/pdf/tcpdf/images/alpha.png        |   Bin 13168 -> 0 bytes
 3rdparty/phpdocx/pdf/tcpdf/images/bug.eps          |  1809 --
 3rdparty/phpdocx/pdf/tcpdf/images/image_demo.jpg   |   Bin 573845 -> 0 bytes
 .../phpdocx/pdf/tcpdf/images/image_with_alpha.png  |   Bin 230267 -> 0 bytes
 3rdparty/phpdocx/pdf/tcpdf/images/img.png          |   Bin 81634 -> 0 bytes
 3rdparty/phpdocx/pdf/tcpdf/images/logo_example.gif |   Bin 21022 -> 0 bytes
 3rdparty/phpdocx/pdf/tcpdf/images/logo_example.jpg |   Bin 32732 -> 0 bytes
 3rdparty/phpdocx/pdf/tcpdf/images/logo_example.png |   Bin 19411 -> 0 bytes
 3rdparty/phpdocx/pdf/tcpdf/images/pelican.ai       |   147 -
 3rdparty/phpdocx/pdf/tcpdf/images/tcpdf_cell.png   |   Bin 38415 -> 0 bytes
 3rdparty/phpdocx/pdf/tcpdf/images/tcpdf_logo.jpg   |   Bin 17633 -> 0 bytes
 .../phpdocx/pdf/tcpdf/images/tcpdf_signature.png   |   Bin 67931 -> 0 bytes
 3rdparty/phpdocx/pdf/tcpdf/images/testsvg.svg      |   328 -
 3rdparty/phpdocx/pdf/tcpdf/images/tiger.ai         |  3599 ---
 3rdparty/phpdocx/pdf/tcpdf/images/tux.svg          |  1487 -
 3rdparty/phpdocx/pdf/tcpdf/pdf417.php              |   991 -
 3rdparty/phpdocx/pdf/tcpdf/qrcode.php              |  2866 --
 3rdparty/phpdocx/pdf/tcpdf/spotcolors.php          |    57 -
 3rdparty/phpdocx/pdf/tcpdf/tcpdf.crt               |    40 -
 3rdparty/phpdocx/pdf/tcpdf/tcpdf.fdf               |   Bin 1286 -> 0 bytes
 3rdparty/phpdocx/pdf/tcpdf/tcpdf.p12               |   Bin 1749 -> 0 bytes
 3rdparty/phpdocx/pdf/tcpdf/tcpdf.php               | 26208 ----------------
 3rdparty/phpdocx/pdf/tcpdf/unicode_data.php        | 18371 -----------
 3rdparty/phpdocx/templates/README.txt              |    12 -
 .../phpdocx/templates/phpdocxBaseTemplate.docx     |   Bin 31693 -> 0 bytes
 3rdparty/phpdocx/templates/xmls/app.xml            |     2 -
 3rdparty/phpdocx/templates/xmls/core.xml           |     2 -
 3rdparty/phpdocx/templates/xmls/document.xml       | 25240 ----------------
 3rdparty/phpdocx/templates/xmls/endnotes.xml       |    23 -
 3rdparty/phpdocx/templates/xmls/footnotes.xml      |    23 -
 3rdparty/phpdocx/templates/xmls/numbering.xml      |   690 -
 3rdparty/phpdocx/templates/xmls/settings.xml       |    62 -
 3rdparty/phpdocx/templates/xmls/styles.xml         | 11410 -------
 3rdparty/phpdocx/xsl/docx2html.xsl                 |  8475 ------
 apps/contacts/lib/backend/shared.php               |     4 +-
 apps/documents/lib/download/range.php              |    15 +-
 apps/files_external/css/settings.css               |     7 +-
 .../3rdparty/Zend/Search/Lucene/Document/Docx.php  |     3 +-
 .../Zend/Search/Lucene/Document/OpenXml.php        |     3 +-
 .../3rdparty/Zend/Search/Lucene/Document/Xlsx.php  |     3 +-
 apps/search_lucene/document/Ods.php                |     3 +-
 apps/search_lucene/document/Odt.php                |     3 +-
 apps/search_lucene/document/OpenDocument.php       |     3 +-
 config/config.sample.php                           |     2 +-
 .../admin/_sources/config/default_parameters.txt   |    10 +-
 core/doc/admin/_sources/config/mail_parameters.txt |     4 +-
 core/doc/admin/_sources/config/miscellaneous.txt   |    96 +-
 .../doc/admin/_sources/configuration/xsendfile.txt |     4 +-
 core/doc/admin/_sources/contents.txt               |     3 +
 core/doc/admin/_sources/cron/index.txt             |     2 +-
 core/doc/admin/_sources/index.txt                  |     2 +
 .../_sources/installation/installation_ucs.txt     |    26 +-
 core/doc/admin/apps/activity/index.html            |     3 +
 .../admin/apps/admin_dependencies_chk/index.html   |     3 +
 core/doc/admin/apps/files_antivirus/index.html     |     3 +
 core/doc/admin/apps/files_encryption/index.html    |     3 +
 core/doc/admin/apps/files_external/index.html      |     3 +
 core/doc/admin/apps/files_sharing/index.html       |     3 +
 core/doc/admin/apps/files_trashbin/index.html      |     3 +
 core/doc/admin/apps/files_versions/index.html      |     3 +
 core/doc/admin/apps/firstrunwizard/index.html      |     3 +
 core/doc/admin/apps/index.html                     |     3 +
 core/doc/admin/apps/user_ldap/index.html           |     3 +
 core/doc/admin/apps/viewers/index.html             |     3 +
 core/doc/admin/config/apps.html                    |     3 +
 core/doc/admin/config/code_locations.html          |     3 +
 core/doc/admin/config/default_parameters.html      |    13 +-
 core/doc/admin/config/deleted_items.html           |     3 +
 core/doc/admin/config/index.html                   |     5 +-
 core/doc/admin/config/logging.html                 |     3 +
 core/doc/admin/config/mail_parameters.html         |     7 +-
 core/doc/admin/config/maintenance.html             |     3 +
 core/doc/admin/config/miscellaneous.html           |     5 +-
 core/doc/admin/config/previews.html                |     3 +
 .../admin/config/reverse_proxy_configurations.html |     3 +
 core/doc/admin/config/session_info.html            |     3 +
 core/doc/admin/config/user_experience.html         |     3 +
 core/doc/admin/config/verification.html            |     3 +
 core/doc/admin/configuration/auth_ldap.html        |     3 +
 core/doc/admin/configuration/background_jobs.html  |     3 +
 .../configuration/configuration_3rdparty.html      |     3 +
 .../admin/configuration/configuration_apps.html    |     3 +
 .../configuration/configuration_automation.html    |     3 +
 .../configuration_custom_clients.html              |     3 +
 .../configuration/configuration_database.html      |     3 +
 .../configuration/configuration_encryption.html    |     3 +
 .../configuration/configuration_knowledgebase.html |     3 +
 .../configuration/configuration_language.html      |     3 +
 .../admin/configuration/configuration_logging.html |     3 +
 .../admin/configuration/configuration_mail.html    |     3 +
 .../configuration/configuration_maintenance.html   |     3 +
 .../admin/configuration/configuration_preview.html |     3 +
 .../configuration/configuration_reverseproxy.html  |     3 +
 .../admin/configuration/configuration_users.html   |     3 +
 .../configuration/configuring_big_file_upload.html |     3 +
 .../admin/configuration/custom_mount_config.html   |     3 +
 .../configuration/custom_mount_config_gui.html     |     3 +
 .../admin/configuration/custom_user_backend.html   |     3 +
 core/doc/admin/configuration/index.html            |     3 +
 core/doc/admin/configuration/xsendfile.html        |     7 +-
 core/doc/admin/contents.html                       |    34 +-
 core/doc/admin/cron/index.html                     |    13 +-
 core/doc/admin/genindex.html                       |     3 +
 core/doc/admin/index.html                          |     5 +
 core/doc/admin/installation/index.html             |     3 +
 .../admin/installation/installation_appliance.html |     3 +
 .../doc/admin/installation/installation_linux.html |     3 +
 .../doc/admin/installation/installation_macos.html |     3 +
 .../admin/installation/installation_others.html    |     3 +
 .../admin/installation/installation_source.html    |     3 +
 core/doc/admin/installation/installation_ucs.html  |    21 +-
 .../admin/installation/installation_windows.html   |     3 +
 core/doc/admin/issues/index.html                   |     3 +
 core/doc/admin/maintenance/backup.html             |     3 +
 core/doc/admin/maintenance/index.html              |     3 +
 core/doc/admin/maintenance/migrating.html          |     5 +-
 core/doc/admin/maintenance/restore.html            |     3 +
 core/doc/admin/maintenance/update.html             |     3 +
 core/doc/admin/quota/index.html                    |    23 +-
 core/doc/admin/search.html                         |     3 +
 core/doc/admin/sharing_api/create_a_new_share.html |    24 +-
 core/doc/admin/sharing_api/delete_share.html       |    21 +-
 core/doc/admin/sharing_api/get_all_shares.html     |    21 +-
 .../get_information_about_a_known_share.html       |    21 +-
 .../get_shares_from_a_specific_file_or_folder.html |    24 +-
 core/doc/admin/sharing_api/index.html              |    18 +-
 core/skeleton/ownCloudUserManual.pdf               |   Bin 1571999 -> 1572005 bytes
 lib/base.php                                       |     2 +-
 lib/private/preview/office-fallback.php            |   143 -
 lib/private/preview/office.php                     |     6 -
 lib/private/updater.php                            |     2 +-
 version.php                                        |     8 +-
 1067 files changed, 523 insertions(+), 593064 deletions(-)

diff --cc apps/contacts/lib/backend/shared.php
index e4213b0,0000000..672af07
mode 100644,000000..100644
--- a/apps/contacts/lib/backend/shared.php
+++ b/apps/contacts/lib/backend/shared.php
@@@ -1,131 -1,0 +1,133 @@@
 +<?php
 +/**
 + * ownCloud - Backend for Shared contacts
 + *
 + * @author Thomas Tanghus
 + * @copyright 2013 Thomas Tanghus (thomas at tanghus.net)
 + *
 + * This library is free software; you can redistribute it and/or
 + * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
 + * License as published by the Free Software Foundation; either
 + * version 3 of the License, or 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 AFFERO GENERAL PUBLIC LICENSE for more details.
 + *
 + * You should have received a copy of the GNU Affero General Public
 + * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 + *
 + */
 +
 +namespace OCA\Contacts\Backend;
 +
 +use OCA\Contacts;
 +
 +/**
 + * Subclass this class for Cantacts backends
 + */
 +
 +class Shared extends Database {
 +
 +	public $name = 'shared';
- 	public $addressbooks = array();
++	public $addressBooks = array();
 +
 +	/**
 +	 * Returns the list of addressbooks for a specific user.
 +	 *
 +	 * @param string $principaluri
 +	 * @return array
 +	 */
 +	public function getAddressBooksForUser(array $options = array()) {
 +
 +		// workaround for https://github.com/owncloud/core/issues/2814
 +		$maybeSharedAddressBook = \OCP\Share::getItemsSharedWith(
 +			'addressbook',
 +			Contacts\Share\Addressbook::FORMAT_ADDRESSBOOKS
 +		);
 +
++		$this->addressBooks = array();
++
 +		foreach ($maybeSharedAddressBook as $sharedAddressbook) {
 +
 +			if (isset($sharedAddressbook['id'])) {
 +				$this->addressBooks[$sharedAddressbook['id']] = $sharedAddressbook;
 +				$this->addressBooks[$sharedAddressbook['id']]['backend'] = $this->name;
 +			}
 +		}
 +
 +		return $this->addressBooks;
 +	}
 +
 +	/**
 +	 * Returns a specific address book.
 +	 *
 +	 * @param string $addressbookid
 +	 * @param mixed $id Contact ID
 +	 * @return mixed
 +	 */
 +	public function getAddressBook($addressbookid, array $options = array()) {
 +		$addressBook = \OCP\Share::getItemSharedWithBySource(
 +			'addressbook',
 +			$addressbookid,
 +			Contacts\Share\Addressbook::FORMAT_ADDRESSBOOKS
 +		);
 +		// Not sure if I'm doing it wrongly, or if its supposed to return
 +		// the info in an array?
 +		$addressBook = (isset($addressBook['permissions']) ? $addressBook : $addressBook[0]);
 +		$addressBook['backend'] = $this->name;
 +		return $addressBook;
 +	}
 +
 +	/**
 +	 * Returns all contacts for a specific addressbook id.
 +	 *
 +	 * @param string $addressbookid
 +	 * @param bool $omitdata Don't fetch the entire carddata or vcard.
 +	 * @return array
 +	 */
 +	public function getContacts($addressbookid, array $options = array()) {
 +
 +		$addressBook = $this->getAddressBook($addressbookid);
 +		if(!$addressBook) {
 +			throw new \Exception('Shared Address Book not found: ' . $addressbookid, 404);
 +		}
 +		$permissions = $addressBook['permissions'];
 +
 +		$cards = parent::getContacts($addressbookid, $options);
 +
 +		foreach($cards as &$card) {
 +			$card['permissions'] = $permissions;
 +		}
 +
 +		return $cards;
 +	}
 +
 +	/**
 +	 * Returns a specific contact.
 +	 *
 +	 * The $id for Database and Shared backends can be an array containing
 +	 * either 'id' or 'uri' to be able to play seamlessly with the
 +	 * CardDAV backend.
 +	 * @see \Database\getContact
 +	 *
 +	 * @param string $addressbookid
 +	 * @param mixed $id Contact ID
 +	 * @return array|false
 +	 */
 +	public function getContact($addressbookid, $id, array $options = array()) {
 +		$addressBook = $this->getAddressBook($addressbookid);
 +		if(!$addressBook) {
 +			throw new \Exception('Shared Address Book not found: ' . $addressbookid, 404);
 +		}
 +		$permissions = $addressBook['permissions'];
 +
 +		$card = parent::getContact($addressbookid, $id, $options);
 +		if(!$card) {
 +			throw new \Exception('Shared Contact not found: ' . implode(',', $id), 404);
 +		}
 +		$card['permissions'] = $permissions;
 +		return $card;
 +	}
 +}
diff --cc apps/documents/lib/download/range.php
index 5aabb2a,0000000..00952ca
mode 100644,000000..100644
--- a/apps/documents/lib/download/range.php
+++ b/apps/documents/lib/download/range.php
@@@ -1,83 -1,0 +1,92 @@@
 +<?php
 +/**
 + * ownCloud - Documents App
 + *
 + * @author Victor Dubiniuk
 + * @copyright 2013 Victor Dubiniuk victor.dubiniuk at gmail.com
 + *
 + * This file is licensed under the Affero General Public License version 3 or
 + * later.
 + */
 +
 +namespace OCA\Documents;
 +
 +/**
 + * Class processing range HTTP request (partial download)
 + */
 +class Download_Range extends \OCA\Documents\Download {
 +
 +	// Start of the range
 +	protected $start;
 +	// End of the range
 +	protected $end;
 +
 +	/**
 +	 * Build download model to serve HTTP_RANGE
 +	 * @param type $view - filesystem view
 +	 * @param type $filepath - path to the file relative to this view root
 +	 */
 +	public function __construct($owner, $filepath){
 +		$this->view = $this->getView($owner);
 +		$this->filepath = $filepath;
 +	}
 +
 +	/**
 +	 * Send the requested parts of the file
 +	 */
 +	public function sendResponse(){
 +		if (!preg_match('/^bytes=\d*-\d*(,\d*-\d*)*$/', $_SERVER['HTTP_RANGE'])){
 +			$this->sendNotSatisfiable();
 +		}
 +	
 +		$mimetype = $this->getMimeType();
 +		$content = $this->view->file_get_contents($this->filepath);
 +		$data = Filter::read($content, $mimetype);
 +		$size = strlen($data['content']);
 +		
 +		$ranges = explode(',', substr($_SERVER['HTTP_RANGE'], 6));
 +		foreach ($ranges as $range){
 +			$parts = explode('-', $range);
 +
- 			$start = isset($parts[0]) ? $parts[0] : 0;
- 			$end = isset($parts[1]) ? $parts[1] : $size - 1;
++			if ($parts[0]==='' && $parts[1]=='') {
++				$this->sendNotSatisfiable();
++			}
++			if ($parts[0]==='') {
++				$start = $size - $parts[1];
++				$end = $size - 1;
++			}
++			else {
++				$start = $parts[0];
++				$end = ($parts[1]==='') ? $size - 1 : $parts[1];
++			}
 +
 +			if ($start > $end){
 +				$this->sendNotSatisfiable();
 +			}
 +
 +			$buffer = substr($data['content'], $start,  $end - $start);
 +			$md5Sum = md5($buffer);
 +
 +			// send the headers and data 
- 			header("Content-Length: " . $end - $start);
++			header("Content-Length: " . ($end - $start));
 +			header("Content-md5: " . $md5Sum);
 +			header("Accept-Ranges: bytes");
 +			header('Content-Range: bytes ' . $start . '-' . ($end) . '/' . $size);
 +			header("Connection: close");
 +			header("Content-type: " . $data['mimetype']);
 +			header('Content-Disposition: attachment; filename=' . $this->getFilename());
 +			\OC_Util::obEnd();
 +			echo $buffer;
 +			flush();
 +		}
 +	}
 +
 +	/**
 +	 * Send 416 if we can't satisfy the requested ranges
 +	 */
 +	protected function sendNotSatisfiable(){
 +		header('HTTP/1.1 416 Requested Range Not Satisfiable');
 +		header('Content-Range: bytes */' . $this->getFilesize()); // Required in 416.
 +		exit;
 +	}
 +}
diff --cc apps/search_lucene/3rdparty/Zend/Search/Lucene/Document/Docx.php
index f5d74a6,0000000..0429943
mode 100644,000000..100644
--- a/apps/search_lucene/3rdparty/Zend/Search/Lucene/Document/Docx.php
+++ b/apps/search_lucene/3rdparty/Zend/Search/Lucene/Document/Docx.php
@@@ -1,152 -1,0 +1,153 @@@
 +<?php
 +/**
 + * Zend Framework
 + *
 + * LICENSE
 + *
 + * This source file is subject to the new BSD license that is bundled
 + * with this package in the file LICENSE.txt.
 + * It is also available through the world-wide-web at this URL:
 + * http://framework.zend.com/license/new-bsd
 + * If you did not receive a copy of the license and are unable to
 + * obtain it through the world-wide-web, please send an email
 + * to license at zend.com so we can send you a copy immediately.
 + *
 + * @category   Zend
 + * @package    Zend_Search_Lucene
 + * @subpackage Document
 + * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
 + * @license    http://framework.zend.com/license/new-bsd     New BSD License
 + * @version    $Id: Docx.php 24593 2012-01-05 20:35:02Z matthew $
 + */
 +
 +/** Zend_Search_Lucene_Document_OpenXml */
 +require_once 'Zend/Search/Lucene/Document/OpenXml.php';
 +
 +/**
 + * Docx document.
 + *
 + * @category   Zend
 + * @package    Zend_Search_Lucene
 + * @subpackage Document
 + * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
 + * @license    http://framework.zend.com/license/new-bsd     New BSD License
 + */
 +class Zend_Search_Lucene_Document_Docx extends Zend_Search_Lucene_Document_OpenXml {
 +    /**
 +     * Xml Schema - WordprocessingML
 +     *
 +     * @var string
 +     */
 +    const SCHEMA_WORDPROCESSINGML = 'http://schemas.openxmlformats.org/wordprocessingml/2006/main';
 +
 +    /**
 +     * Object constructor
 +     *
 +     * @param string  $fileName
 +     * @param boolean $storeContent
 +     * @throws Zend_Search_Lucene_Exception
 +     */
 +    private function __construct($fileName, $storeContent) {
 +        if (!class_exists('ZipArchive', false)) {
 +            require_once 'Zend/Search/Lucene/Exception.php';
 +            throw new Zend_Search_Lucene_Exception('MS Office documents processing functionality requires Zip extension to be loaded');
 +        }
 +
 +        // Document data holders
 +        $documentBody = array();
 +        $coreProperties = array();
 +
 +        // Open OpenXML package
 +        $package = new ZipArchive();
 +        $package->open($fileName);
 +
 +        // Read relations and search for officeDocument
 +        $relationsXml = $package->getFromName('_rels/.rels');
 +        if ($relationsXml === false) {
 +            require_once 'Zend/Search/Lucene/Exception.php';
 +            throw new Zend_Search_Lucene_Exception('Invalid archive or corrupted .docx file.');
 +        }
-         libxml_disable_entity_loader(true);
++        $loadEntities = libxml_disable_entity_loader(true);
 +        $relations = simplexml_load_string($relationsXml);
++        libxml_disable_entity_loader($loadEntities);
 +        foreach($relations->Relationship as $rel) {
 +            if ($rel ["Type"] == Zend_Search_Lucene_Document_OpenXml::SCHEMA_OFFICEDOCUMENT) {
 +                // Found office document! Read in contents...
 +                $contents = simplexml_load_string($package->getFromName(
 +                                                                $this->absoluteZipPath(dirname($rel['Target'])
 +                                                              . '/'
 +                                                              . basename($rel['Target']))
 +                                                                       ));
 +
 +                $contents->registerXPathNamespace('w', Zend_Search_Lucene_Document_Docx::SCHEMA_WORDPROCESSINGML);
 +                $paragraphs = $contents->xpath('//w:body/w:p');
 +
 +                foreach ($paragraphs as $paragraph) {
 +                    $runs = $paragraph->xpath('.//w:r/*[name() = "w:t" or name() = "w:br"]');
 +
 +                    if ($runs === false) {
 +                        // Paragraph doesn't contain any text or breaks
 +                        continue;
 +                    }
 +
 +                    foreach ($runs as $run) {
 +                     if ($run->getName() == 'br') {
 +                         // Break element
 +                         $documentBody[] = ' ';
 +                     } else {
 +                         $documentBody[] = (string)$run;
 +                     }
 +                    }
 +
 +                    // Add space after each paragraph. So they are not bound together.
 +                    $documentBody[] = ' ';
 +                }
 +
 +                break;
 +            }
 +        }
 +
 +        // Read core properties
 +        $coreProperties = $this->extractMetaData($package);
 +
 +        // Close file
 +        $package->close();
 +
 +        // Store filename
 +        $this->addField(Zend_Search_Lucene_Field::Text('filename', $fileName, 'UTF-8'));
 +
 +        // Store contents
 +        if ($storeContent) {
 +            $this->addField(Zend_Search_Lucene_Field::Text('body', implode('', $documentBody), 'UTF-8'));
 +        } else {
 +            $this->addField(Zend_Search_Lucene_Field::UnStored('body', implode('', $documentBody), 'UTF-8'));
 +        }
 +
 +        // Store meta data properties
 +        foreach ($coreProperties as $key => $value) {
 +            $this->addField(Zend_Search_Lucene_Field::Text($key, $value, 'UTF-8'));
 +        }
 +
 +        // Store title (if not present in meta data)
 +        if (! isset($coreProperties['title'])) {
 +            $this->addField(Zend_Search_Lucene_Field::Text('title', $fileName, 'UTF-8'));
 +        }
 +    }
 +
 +    /**
 +     * Load Docx document from a file
 +     *
 +     * @param string  $fileName
 +     * @param boolean $storeContent
 +     * @return Zend_Search_Lucene_Document_Docx
 +     * @throws Zend_Search_Lucene_Document_Exception
 +     */
 +    public static function loadDocxFile($fileName, $storeContent = false) {
 +        if (!is_readable($fileName)) {
 +            require_once 'Zend/Search/Lucene/Document/Exception.php';
 +            throw new Zend_Search_Lucene_Document_Exception('Provided file \'' . $fileName . '\' is not readable.');
 +        }
 +
 +        return new Zend_Search_Lucene_Document_Docx($fileName, $storeContent);
 +    }
 +}
diff --cc apps/search_lucene/3rdparty/Zend/Search/Lucene/Document/OpenXml.php
index 871b75e,0000000..fa884a7
mode 100644,000000..100644
--- a/apps/search_lucene/3rdparty/Zend/Search/Lucene/Document/OpenXml.php
+++ b/apps/search_lucene/3rdparty/Zend/Search/Lucene/Document/OpenXml.php
@@@ -1,130 -1,0 +1,131 @@@
 +<?php
 +/**
 + * Zend Framework
 + *
 + * LICENSE
 + *
 + * This source file is subject to the new BSD license that is bundled
 + * with this package in the file LICENSE.txt.
 + * It is also available through the world-wide-web at this URL:
 + * http://framework.zend.com/license/new-bsd
 + * If you did not receive a copy of the license and are unable to
 + * obtain it through the world-wide-web, please send an email
 + * to license at zend.com so we can send you a copy immediately.
 + *
 + * @category   Zend
 + * @package    Zend_Search_Lucene
 + * @subpackage Document
 + * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
 + * @license    http://framework.zend.com/license/new-bsd     New BSD License
 + * @version    $Id: OpenXml.php 24593 2012-01-05 20:35:02Z matthew $
 + */
 +
 +
 +/** Zend_Search_Lucene_Document */
 +require_once 'Zend/Search/Lucene/Document.php';
 +
 +
 +/**
 + * OpenXML document.
 + *
 + * @category   Zend
 + * @package    Zend_Search_Lucene
 + * @subpackage Document
 + * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
 + * @license    http://framework.zend.com/license/new-bsd     New BSD License
 + */
 +abstract class Zend_Search_Lucene_Document_OpenXml extends Zend_Search_Lucene_Document
 +{
 +    /**
 +     * Xml Schema - Relationships
 +     *
 +     * @var string
 +     */
 +    const SCHEMA_RELATIONSHIP = 'http://schemas.openxmlformats.org/package/2006/relationships';
 +
 +    /**
 +     * Xml Schema - Office document
 +     *
 +     * @var string
 +     */
 +    const SCHEMA_OFFICEDOCUMENT = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument';
 +
 +    /**
 +     * Xml Schema - Core properties
 +     *
 +     * @var string
 +     */
 +    const SCHEMA_COREPROPERTIES = 'http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties';
 +
 +    /**
 +     * Xml Schema - Dublin Core
 +     *
 +     * @var string
 +     */
 +    const SCHEMA_DUBLINCORE = 'http://purl.org/dc/elements/1.1/';
 +
 +    /**
 +     * Xml Schema - Dublin Core Terms
 +     *
 +     * @var string
 +     */
 +    const SCHEMA_DUBLINCORETERMS = 'http://purl.org/dc/terms/';
 +
 +    /**
 +     * Extract metadata from document
 +     *
 +     * @param ZipArchive $package    ZipArchive OpenXML package
 +     * @return array    Key-value pairs containing document meta data
 +     */
 +    protected function extractMetaData(ZipArchive $package)
 +    {
 +        // Data holders
 +        $coreProperties = array();
 +
 +        // Read relations and search for core properties
-         libxml_disable_entity_loader(true);
++        $loadEntities = libxml_disable_entity_loader(true);
 +        $relations = simplexml_load_string($package->getFromName("_rels/.rels"));
++        libxml_disable_entity_loader($loadEntities);
 +        foreach ($relations->Relationship as $rel) {
 +            if ($rel["Type"] == Zend_Search_Lucene_Document_OpenXml::SCHEMA_COREPROPERTIES) {
 +                // Found core properties! Read in contents...
 +                $contents = simplexml_load_string(
 +                    $package->getFromName(dirname($rel["Target"]) . "/" . basename($rel["Target"]))
 +                );
 +
 +                foreach ($contents->children(Zend_Search_Lucene_Document_OpenXml::SCHEMA_DUBLINCORE) as $child) {
 +                    $coreProperties[$child->getName()] = (string)$child;
 +                }
 +                foreach ($contents->children(Zend_Search_Lucene_Document_OpenXml::SCHEMA_COREPROPERTIES) as $child) {
 +                    $coreProperties[$child->getName()] = (string)$child;
 +                }
 +                foreach ($contents->children(Zend_Search_Lucene_Document_OpenXml::SCHEMA_DUBLINCORETERMS) as $child) {
 +                    $coreProperties[$child->getName()] = (string)$child;
 +                }
 +            }
 +        }
 +
 +        return $coreProperties;
 +    }
 +
 +    /**
 +     * Determine absolute zip path
 +     *
 +     * @param string $path
 +     * @return string
 +     */
 +    protected function absoluteZipPath($path) {
 +        $path = str_replace(array('/', '\\'), DIRECTORY_SEPARATOR, $path);
 +        $parts = array_filter(explode(DIRECTORY_SEPARATOR, $path), 'strlen');
 +        $absolutes = array();
 +        foreach ($parts as $part) {
 +            if ('.' == $part) continue;
 +            if ('..' == $part) {
 +                array_pop($absolutes);
 +            } else {
 +                $absolutes[] = $part;
 +            }
 +        }
 +        return implode('/', $absolutes);
 +    }
 +}
diff --cc apps/search_lucene/3rdparty/Zend/Search/Lucene/Document/Xlsx.php
index dcdd14f,0000000..5df3bfc
mode 100644,000000..100644
--- a/apps/search_lucene/3rdparty/Zend/Search/Lucene/Document/Xlsx.php
+++ b/apps/search_lucene/3rdparty/Zend/Search/Lucene/Document/Xlsx.php
@@@ -1,264 -1,0 +1,265 @@@
 +<?php
 +/**
 + * Zend Framework
 + *
 + * LICENSE
 + *
 + * This source file is subject to the new BSD license that is bundled
 + * with this package in the file LICENSE.txt.
 + * It is also available through the world-wide-web at this URL:
 + * http://framework.zend.com/license/new-bsd
 + * If you did not receive a copy of the license and are unable to
 + * obtain it through the world-wide-web, please send an email
 + * to license at zend.com so we can send you a copy immediately.
 + *
 + * @category   Zend
 + * @package    Zend_Search_Lucene
 + * @subpackage Document
 + * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
 + * @license    http://framework.zend.com/license/new-bsd     New BSD License
 + * @version    $Id: Xlsx.php 24593 2012-01-05 20:35:02Z matthew $
 + */
 +
 +
 +/** Zend_Search_Lucene_Document_OpenXml */
 +require_once 'Zend/Search/Lucene/Document/OpenXml.php';
 +
 +/**
 + * Xlsx document.
 + *
 + * @category   Zend
 + * @package    Zend_Search_Lucene
 + * @subpackage Document
 + * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
 + * @license    http://framework.zend.com/license/new-bsd     New BSD License
 + */
 +class Zend_Search_Lucene_Document_Xlsx extends Zend_Search_Lucene_Document_OpenXml
 +{
 +    /**
 +     * Xml Schema - SpreadsheetML
 +     *
 +     * @var string
 +     */
 +    const SCHEMA_SPREADSHEETML = 'http://schemas.openxmlformats.org/spreadsheetml/2006/main';
 +
 +    /**
 +     * Xml Schema - DrawingML
 +     *
 +     * @var string
 +     */
 +    const SCHEMA_DRAWINGML = 'http://schemas.openxmlformats.org/drawingml/2006/main';
 +
 +    /**
 +     * Xml Schema - Shared Strings
 +     *
 +     * @var string
 +     */
 +    const SCHEMA_SHAREDSTRINGS = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings';
 +
 +    /**
 +     * Xml Schema - Worksheet relation
 +     *
 +     * @var string
 +     */
 +    const SCHEMA_WORKSHEETRELATION = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet';
 +
 +    /**
 +     * Xml Schema - Slide notes relation
 +     *
 +     * @var string
 +     */
 +    const SCHEMA_SLIDENOTESRELATION = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/notesSlide';
 +
 +    /**
 +     * Object constructor
 +     *
 +     * @param string  $fileName
 +     * @param boolean $storeContent
 +     * @throws Zend_Search_Lucene_Exception
 +     */
 +    private function __construct($fileName, $storeContent)
 +    {
 +        if (!class_exists('ZipArchive', false)) {
 +            require_once 'Zend/Search/Lucene/Exception.php';
 +            throw new Zend_Search_Lucene_Exception('MS Office documents processing functionality requires Zip extension to be loaded');
 +        }
 +
 +        // Document data holders
 +        $sharedStrings = array();
 +        $worksheets = array();
 +        $documentBody = array();
 +        $coreProperties = array();
 +
 +        // Open OpenXML package
 +        $package = new ZipArchive();
 +        $package->open($fileName);
 +
 +        // Read relations and search for officeDocument
 +        $relationsXml = $package->getFromName('_rels/.rels');
 +        if ($relationsXml === false) {
 +            require_once 'Zend/Search/Lucene/Exception.php';
 +            throw new Zend_Search_Lucene_Exception('Invalid archive or corrupted .xlsx file.');
 +        }
-         libxml_disable_entity_loader(true);
++        $loadEntities = libxml_disable_entity_loader(true);
 +        $relations = simplexml_load_string($relationsXml);
++        libxml_disable_entity_loader($loadEntities);
 +        foreach ($relations->Relationship as $rel) {
 +            if ($rel["Type"] == Zend_Search_Lucene_Document_OpenXml::SCHEMA_OFFICEDOCUMENT) {
 +                // Found office document! Read relations for workbook...
 +                $workbookRelations = simplexml_load_string($package->getFromName( $this->absoluteZipPath(dirname($rel["Target"]) . "/_rels/" . basename($rel["Target"]) . ".rels")) );
 +                $workbookRelations->registerXPathNamespace("rel", Zend_Search_Lucene_Document_OpenXml::SCHEMA_RELATIONSHIP);
 +
 +                // Read shared strings
 +                $sharedStringsPath = $workbookRelations->xpath("rel:Relationship[@Type='" . Zend_Search_Lucene_Document_Xlsx::SCHEMA_SHAREDSTRINGS . "']");
 +                $sharedStringsPath = (string)$sharedStringsPath[0]['Target'];
 +                $xmlStrings = simplexml_load_string($package->getFromName( $this->absoluteZipPath(dirname($rel["Target"]) . "/" . $sharedStringsPath)) );
 +                if (isset($xmlStrings) && isset($xmlStrings->si)) {
 +                    foreach ($xmlStrings->si as $val) {
 +                        if (isset($val->t)) {
 +                            $sharedStrings[] = (string)$val->t;
 +                        } elseif (isset($val->r)) {
 +                            $sharedStrings[] = $this->_parseRichText($val);
 +                        }
 +                    }
 +                }
 +
 +                // Loop relations for workbook and extract worksheets...
 +                foreach ($workbookRelations->Relationship as $workbookRelation) {
 +                    if ($workbookRelation["Type"] == Zend_Search_Lucene_Document_Xlsx::SCHEMA_WORKSHEETRELATION) {
 +                        $worksheets[ str_replace( 'rId', '', (string)$workbookRelation["Id"]) ] = simplexml_load_string(
 +                            $package->getFromName( $this->absoluteZipPath(dirname($rel["Target"]) . "/" . dirname($workbookRelation["Target"]) . "/" . basename($workbookRelation["Target"])) )
 +                        );
 +                    }
 +                }
 +
 +                break;
 +            }
 +        }
 +
 +        // Sort worksheets
 +        ksort($worksheets);
 +
 +        // Extract contents from worksheets
 +        foreach ($worksheets as $sheetKey => $worksheet) {
 +            foreach ($worksheet->sheetData->row as $row) {
 +                foreach ($row->c as $c) {
 +                    // Determine data type
 +                    $dataType = (string)$c["t"];
 +                    switch ($dataType) {
 +                        case "s":
 +                            // Value is a shared string
 +                            if ((string)$c->v != '') {
 +                                $value = $sharedStrings[intval($c->v)];
 +                            } else {
 +                                $value = '';
 +                            }
 +
 +                            break;
 +
 +                        case "b":
 +                            // Value is boolean
 +                            $value = (string)$c->v;
 +                            if ($value == '0') {
 +                                $value = false;
 +                            } else if ($value == '1') {
 +                                $value = true;
 +                            } else {
 +                                $value = (bool)$c->v;
 +                            }
 +
 +                            break;
 +
 +                        case "inlineStr":
 +                            // Value is rich text inline
 +                            $value = $this->_parseRichText($c->is);
 +
 +                            break;
 +
 +                        case "e":
 +                            // Value is an error message
 +                            if ((string)$c->v != '') {
 +                                $value = (string)$c->v;
 +                            } else {
 +                                $value = '';
 +                            }
 +
 +                            break;
 +
 +                        default:
 +                            // Value is a string
 +                            $value = (string)$c->v;
 +
 +                            // Check for numeric values
 +                            if (is_numeric($value) && $dataType != 's') {
 +                                if ($value == (int)$value) $value = (int)$value;
 +                                elseif ($value == (float)$value) $value = (float)$value;
 +                                elseif ($value == (double)$value) $value = (double)$value;
 +                            }
 +                    }
 +
 +                    $documentBody[] = $value;
 +                }
 +            }
 +        }
 +
 +        // Read core properties
 +        $coreProperties = $this->extractMetaData($package);
 +
 +        // Close file
 +        $package->close();
 +
 +        // Store filename
 +        $this->addField(Zend_Search_Lucene_Field::Text('filename', $fileName, 'UTF-8'));
 +
 +        // Store contents
 +        if ($storeContent) {
 +            $this->addField(Zend_Search_Lucene_Field::Text('body', implode(' ', $documentBody), 'UTF-8'));
 +        } else {
 +            $this->addField(Zend_Search_Lucene_Field::UnStored('body', implode(' ', $documentBody), 'UTF-8'));
 +        }
 +
 +        // Store meta data properties
 +        foreach ($coreProperties as $key => $value)
 +        {
 +            $this->addField(Zend_Search_Lucene_Field::Text($key, $value, 'UTF-8'));
 +        }
 +
 +        // Store title (if not present in meta data)
 +        if (!isset($coreProperties['title']))
 +        {
 +            $this->addField(Zend_Search_Lucene_Field::Text('title', $fileName, 'UTF-8'));
 +        }
 +    }
 +
 +    /**
 +     * Parse rich text XML
 +     *
 +     * @param SimpleXMLElement $is
 +     * @return string
 +     */
 +    private function _parseRichText($is = null) {
 +        $value = array();
 +
 +        if (isset($is->t)) {
 +            $value[] = (string)$is->t;
 +        } else {
 +            foreach ($is->r as $run) {
 +                $value[] = (string)$run->t;
 +            }
 +        }
 +
 +        return implode('', $value);
 +    }
 +
 +    /**
 +     * Load Xlsx document from a file
 +     *
 +     * @param string  $fileName
 +     * @param boolean $storeContent
 +     * @return Zend_Search_Lucene_Document_Xlsx
 +     */
 +    public static function loadXlsxFile($fileName, $storeContent = false)
 +    {
 +        return new Zend_Search_Lucene_Document_Xlsx($fileName, $storeContent);
 +    }
 +}
diff --cc apps/search_lucene/document/Ods.php
index 8ba3c1a,0000000..0fe1593
mode 100644,000000..100644
--- a/apps/search_lucene/document/Ods.php
+++ b/apps/search_lucene/document/Ods.php
@@@ -1,88 -1,0 +1,89 @@@
 +<?php
 +
 +namespace OCA\Search_Lucene\Document;
 +/**
 + * Ods document.
 + * @see http://en.wikipedia.org/wiki/OpenDocument_technical_specification
 + */
 +class Ods extends OpenDocument {
 +
 +	const SCHEMA_ODTABLE = 'urn:oasis:names:tc:opendocument:xmlns:table:1.0';
 +
 +    /**
 +     * Object constructor
 +     *
 +     * @param string  $fileName
 +     * @param boolean $storeContent
 +     * @throws \Zend_Search_Lucene_Exception
 +     */
 +    private function __construct($fileName, $storeContent) {
 +        if (!class_exists('ZipArchive', false)) {
 +            throw new \Zend_Search_Lucene_Exception('Open Document Spreadsheet processing functionality requires Zip extension to be loaded');
 +        }
 +
 +        // Document data holders
 +		$documentTables = array();
 +		$documentCells = array();
 +
 +        // Open OpenXML package
 +        $package = new \ZipArchive();
 +        $package->open($fileName);
 +
 +        // Read relations and search for officeDocument
 +        $content = $package->getFromName('content.xml');
 +        if ($content === false) {
 +            throw new \Zend_Search_Lucene_Exception('Invalid archive or corrupted .ods file.');
 +        }
-         	libxml_disable_entity_loader(true);
++		$loadEntities = libxml_disable_entity_loader(true);
 +		$sxe = simplexml_load_string($content, 'SimpleXMLElement', LIBXML_NOBLANKS | LIBXML_COMPACT);
++		libxml_disable_entity_loader($loadEntities);
 +
 +		foreach ($sxe->xpath('//table:table[@table:name]') as $table) {
 +			$documentTables[] = (string)$table->attributes($this::SCHEMA_ODTABLE)->name;
 +		}
 +		foreach ($sxe->xpath('//text:p') as $cell) {
 +			$documentCells[] = (string)$cell;
 +		}
 +
 +        // Read core properties
 +        $coreProperties = $this->extractMetaData($package);
 +
 +        // Close file
 +        $package->close();
 +
 +        // Store contents
 +        if ($storeContent) {
 +			$this->addField(\Zend_Search_Lucene_Field::Text('sheets', implode(' ', $documentTables), 'UTF-8'));
 +			$this->addField(\Zend_Search_Lucene_Field::Text('body', implode(' ', $documentCells), 'UTF-8'));
 +        } else {
 +			$this->addField(\Zend_Search_Lucene_Field::UnStored('sheets', implode(' ', $documentTables), 'UTF-8'));
 +			$this->addField(\Zend_Search_Lucene_Field::UnStored('body', implode(' ', $documentCells), 'UTF-8'));
 +        }
 +
 +        // Store meta data properties
 +        foreach ($coreProperties as $key => $value) {
 +            $this->addField(\Zend_Search_Lucene_Field::Text($key, $value, 'UTF-8'));
 +        }
 +
 +        // Store title (if not present in meta data)
 +        if (! isset($coreProperties['title'])) {
 +            $this->addField(\Zend_Search_Lucene_Field::Text('title', $fileName, 'UTF-8'));
 +        }
 +    }
 +
 +    /**
 +     * Load Ods document from a file
 +     *
 +     * @param string  $fileName
 +     * @param boolean $storeContent
 +     * @return Ods
 +     * @throws \Zend_Search_Lucene_Document_Exception
 +     */
 +    public static function loadOdsFile($fileName, $storeContent = false) {
 +        if (!is_readable($fileName)) {
 +            throw new \Zend_Search_Lucene_Document_Exception('Provided file \'' . $fileName . '\' is not readable.');
 +        }
 +
 +        return new Ods($fileName, $storeContent);
 +    }
 +}
diff --cc apps/search_lucene/document/Odt.php
index c850c71,0000000..8869c2c
mode 100644,000000..100644
--- a/apps/search_lucene/document/Odt.php
+++ b/apps/search_lucene/document/Odt.php
@@@ -1,86 -1,0 +1,87 @@@
 +<?php
 +
 +namespace OCA\Search_Lucene\Document;
 +/**
 + * Odt document.
 + * @see http://en.wikipedia.org/wiki/OpenDocument_technical_specification
 + */
 +class Odt extends OpenDocument {
 +    /**
 +     * Object constructor
 +     *
 +     * @param string  $fileName
 +     * @param boolean $storeContent
 +     * @throws \Zend_Search_Lucene_Exception
 +     */
 +    private function __construct($fileName, $storeContent) {
 +        if (!class_exists('ZipArchive', false)) {
 +            throw new \Zend_Search_Lucene_Exception('Open Document Text processing functionality requires Zip extension to be loaded');
 +        }
 +
 +        // Document data holders
 +		$documentHeadlines = array();
 +		$documentParagraphs = array();
 +
 +        // Open OpenXML package
 +        $package = new \ZipArchive();
 +        $package->open($fileName);
 +
 +        // Read relations and search for officeDocument
 +        $content = $package->getFromName('content.xml');
 +        if ($content === false) {
 +            throw new \Zend_Search_Lucene_Exception('Invalid archive or corrupted .odt file.');
 +        }
- 			libxml_disable_entity_loader(true);
++		$loadEntities = libxml_disable_entity_loader(true);
 +		$sxe = simplexml_load_string($content, 'SimpleXMLElement', LIBXML_NOBLANKS | LIBXML_COMPACT);
++		libxml_disable_entity_loader($loadEntities);
 +
 +		foreach ($sxe->xpath('//text:h') as $headline) {
 +			$documentHeadlines[] = (string)$headline;
 +		}
 +
 +		foreach ($sxe->xpath('//text:p') as $paragraph) {
 +			$documentParagraphs[] = (string)$paragraph;
 +		}
 +
 +        // Read core properties
 +        $coreProperties = $this->extractMetaData($package);
 +
 +        // Close file
 +        $package->close();
 +
 +        // Store contents
 +        if ($storeContent) {
 +			$this->addField(\Zend_Search_Lucene_Field::Text('headlines', implode(' ', $documentHeadlines), 'UTF-8'));
 +			$this->addField(\Zend_Search_Lucene_Field::Text('body', implode(' ', $documentParagraphs), 'UTF-8'));
 +        } else {
 +			$this->addField(\Zend_Search_Lucene_Field::UnStored('headlines', implode(' ', $documentHeadlines), 'UTF-8'));
 +			$this->addField(\Zend_Search_Lucene_Field::UnStored('body', implode(' ', $documentParagraphs), 'UTF-8'));
 +        }
 +
 +        // Store meta data properties
 +        foreach ($coreProperties as $key => $value) {
 +            $this->addField(\Zend_Search_Lucene_Field::Text($key, $value, 'UTF-8'));
 +        }
 +
 +        // Store title (if not present in meta data)
 +        if (! isset($coreProperties['title'])) {
 +            $this->addField(\Zend_Search_Lucene_Field::Text('title', $fileName, 'UTF-8'));
 +        }
 +    }
 +
 +    /**
 +     * Load Odt document from a file
 +     *
 +     * @param string  $fileName
 +     * @param boolean $storeContent
 +     * @return Odt
 +     * @throws \Zend_Search_Lucene_Document_Exception
 +     */
 +    public static function loadOdtFile($fileName, $storeContent = false) {
 +        if (!is_readable($fileName)) {
 +            throw new \Zend_Search_Lucene_Document_Exception('Provided file \'' . $fileName . '\' is not readable.');
 +        }
 +
 +        return new Odt($fileName, $storeContent);
 +    }
 +}
diff --cc apps/search_lucene/document/OpenDocument.php
index d2a14d3,0000000..4abbdf6
mode 100644,000000..100644
--- a/apps/search_lucene/document/OpenDocument.php
+++ b/apps/search_lucene/document/OpenDocument.php
@@@ -1,82 -1,0 +1,83 @@@
 +<?php
 +
 +namespace OCA\Search_Lucene\Document;
 +/**
 + * OpenDocument document.
 + */
 +abstract class OpenDocument extends \Zend_Search_Lucene_Document
 +{
 +	const OASIS_XPATH_TITLE    = '//dc:title';
 +	const OASIS_XPATH_SUBJECT  = '//dc:subject';
 +	const OASIS_XPATH_CREATOR  = '//meta:initial-creator';
 +	const OASIS_XPATH_KEYWORDS = '//meta:keyword';
 +	const OASIS_XPATH_CREATED  = '//meta:creation-date';
 +	const OASIS_XPATH_MODIFIED = '//dc:date';
 +
 +    /**
 +     * Extract metadata from document
 +     *
 +     * @param ZipArchive $package ZipArchive OpenDocument package
 +     * @return array Key-value pairs containing document meta data
 +     */
 +    protected function extractMetaData(\ZipArchive $package)
 +    {
 +        // Data holders
 +        $coreProperties = array();
 +
 +        // Read relations and search for core properties
- 		libxml_disable_entity_loader(true);
++		$loadEntities = libxml_disable_entity_loader(true);
 +		$sxe = simplexml_load_string($package->getFromName("meta.xml"));
++		libxml_disable_entity_loader($loadEntities);
 +
 +		if (is_object($sxe) && $sxe instanceof \SimpleXMLElement) {
 +
 +			$coreProperties['title'] = $this->extractTermsFromMetadata($sxe, $this::OASIS_XPATH_TITLE);
 +
 +			$coreProperties['subject'] = $this->extractTermsFromMetadata($sxe, $this::OASIS_XPATH_SUBJECT);
 +
 +			$coreProperties['creator'] = $this->extractTermsFromMetadata($sxe, $this::OASIS_XPATH_CREATOR);
 +
 +			$coreProperties['keywords'] = $this->extractTermsFromMetadata($sxe, $this::OASIS_XPATH_KEYWORDS);
 +
 +			//replace T in date string with ' '
 +			$coreProperties['created'] = str_replace('T', ' ', $this->extractTermsFromMetadata($sxe, $this::OASIS_XPATH_CREATED));
 +
 +			$coreProperties['modified'] = str_replace('T', ' ', $this->extractTermsFromMetadata($sxe, $this::OASIS_XPATH_MODIFIED));
 +		}
 +
 +        return $coreProperties;
 +    }
 +
 +	private function extractTermsFromMetadata(\SimpleXMLElement $sxe, $path) {
 +
 +		$terms = array();
 +
 +		foreach ($sxe->xpath($path) as $value) {
 +			$terms[] = (string)$value;
 +		}
 +
 +		return (implode(' ', $terms));
 +
 +	}
 +
 +    /**
 +     * Determine absolute zip path
 +     *
 +     * @param string $path
 +     * @return string
 +     */
 +    protected function absoluteZipPath($path) {
 +        $path = str_replace(array('/', '\\'), DIRECTORY_SEPARATOR, $path);
 +        $parts = array_filter(explode(DIRECTORY_SEPARATOR, $path), 'strlen');
 +        $absolutes = array();
 +        foreach ($parts as $part) {
 +            if ('.' == $part) continue;
 +            if ('..' == $part) {
 +                array_pop($absolutes);
 +            } else {
 +                $absolutes[] = $part;
 +            }
 +        }
 +        return implode('/', $absolutes);
 +    }
 +}
diff --cc config/config.sample.php
index 72b21ff,0cf8611..0cf8611
mode 100644,100755..100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
diff --cc core/doc/admin/_sources/config/default_parameters.txt
index 7f28a8b,0000000..790b410
mode 100644,000000..100644
--- a/core/doc/admin/_sources/config/default_parameters.txt
+++ b/core/doc/admin/_sources/config/default_parameters.txt
@@@ -1,74 -1,0 +1,74 @@@
 +Default Parameters
 +==================
 +
 +The following parameters are automatically configured by ownCloud upon the initial admin login.
 +These parameters are mandatory for the ownCloud instance to operate properly.
 +
 ++---------------------+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 +| **Parameter**       | **Format**                | **Description**                                                                                                                                                                     |
 +|                     |                           |                                                                                                                                                                                     |
 ++---------------------+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 +| **Debug**           | define("DEBUG", true);    | When set to true, additional information is written to the logs.                                                                                                                    |
 +|                     |                           | This is to be used only for local development and not in a production environment.                                                                                                  |
 +|                     |                           |                                                                                                                                                                                     |
 ++---------------------+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 +| **Installed**       | "installed" => false,     | This flag indicates whether the ownCloud instance was installed successfully.                                                                                                       |
 +|                     |                           | When set to true, the install was successful.                                                                                                                                       |
 +|                     |                           | When set to false the instance is not properly installed.                                                                                                                           |
 +|                     |                           |                                                                                                                                                                                     |
 ++---------------------+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 +| **DB Type**         | "dbtype" => "sqlite",     | The dbtype indicates what type of database is being used with this install.                                                                                                         |
 +|                     |                           |                                                                                                                                                                                     |
 +|                     |                           |                                                                                                                                                                                     |
 ++---------------------+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 +| **DB Name**         | "dbname" => "owncloud",   | The ownCloud database within the SQL instance.                                                                                                                                      |
 +|                     |                           | ownCloud database configuration guides use “owncloud” in the instructions, it is the default for this field.                                                                        |
 +|                     |                           | This may be set to any valid table name.                                                                                                                                            |
- |                     |                           | If the table doesn’t exist, the setup will attempt to create it, provided it has proper permissions.                                                                                |
++|                     |                           | If the table does not exist, the setup will attempt to create it, provided it has proper permissions.                                                                               |
 +|                     |                           |                                                                                                                                                                                     |
 ++---------------------+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
- | **DB User**         | "dbuser" => "",           | This is the user that ownCloud uses to write to the databse.                                                                                                                        |
++| **DB User**         | "dbuser" => "",           | This is the user that ownCloud uses to write to the database.                                                                                                                       |
 +|                     |                           | This must be unique across ownCloud instances using the same SQL database.                                                                                                          |
 +|                     |                           | The user will be created when the install wizard is complete.                                                                                                                       |
 +|                     |                           | Since the database user in the initial login screen has admin privileges (root), ownCloud creates a new user to ensure ownCloud does not run with unnecessary database permissions. |
- |                     |                           | ownCloud prefixes “oc_” to the userid to prevent a collision between the ownCloud admin user and any existing database users.                                                       |
++|                     |                           | ownCloud prefixes “oc\_” to the userid to prevent a collision between the ownCloud admin user and any existing database users.                                                      |
 +|                     |                           | This is generated at the time of the initial login and is the Admin User as entered by the ownCloud admin.                                                                          |
 +|                     |                           |                                                                                                                                                                                     |
 ++---------------------+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 +| **DB Password**     | "dbpassword" => "",       | When a new database user is created for ownCloud, a password for the database is generated by hashing the admin user password.                                                      |
 +|                     |                           | This hash is stored in this parameter.                                                                                                                                              |
 +|                     |                           |                                                                                                                                                                                     |
 ++---------------------+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 +| **DB Host**         | "dbhost" => "",           | This parameter shows the location of the database.                                                                                                                                  |
 +|                     |                           | Can be an IP pointing to the database server, a Fully Qualified Domain Name (FQDN) or localhost.                                                                                    |
 +|                     |                           |                                                                                                                                                                                     |
 ++---------------------+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
- | **DB Table Prefix** | "dbtableprefix" => "oc_", | All tables in the database will begin with this prefix.                                                                                                                             |
- |                     |                           | By default the prefix is “oc_”.                                                                                                                                                     |
++| **DB Table Prefix** | "dbtableprefix" => "oc\_",| All tables in the database will begin with this prefix.                                                                                                                             |
++|                     |                           | By default the prefix is “oc\_”.                                                                                                                                                    |
 +|                     |                           | If this prefix is changed in the config file, the tables in the database will need to be manually renamed.                                                                          |
 +|                     |                           | ownCloud will not detect a change to this option so changing this prefix without manually renaming the tables will break the instance of ownCloud.                                  |
 +|                     |                           |                                                                                                                                                                                     |
 ++---------------------+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 +| **Password Salt**   | "passwordsalt" => "",     | This is the salt used to hash passwords within the ownCloud instance.                                                                                                               |
 +|                     |                           | It is important not to remove or lose this password.                                                                                                                                |
 +|                     |                           | If lost, all passwords within the ownCloud instance will be lost.                                                                                                                   |
 +|                     |                           |                                                                                                                                                                                     |
 ++---------------------+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 +| **Data Directory**  | "datadirectory" => "",    | This parameter tells ownCloud where the default data directory is located.                                                                                                          |
 +|                     |                           | It is configured in the installation wizard.                                                                                                                                        |
 +|                     |                           | If using SQLITE, the database is stored in this data directory as well.                                                                                                             |
 +|                     |                           |                                                                                                                                                                                     |
 +|                     |                           |                                                                                                                                                                                     |
 ++---------------------+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 +| **Trusted Domains** |   'trusted_domains' =>    | This parameter identifies trusted URL for ownCloud which users may log into.                                                                                                        |
 +|                     |                           | The initial entry ‘0’ is automatic.                                                                                                                                                 |
 +|                     |   array (                 | If it is desired to have additional entries, these may be added manually.                                                                                                           |
 +|                     |                           | This is used to mitigate Header Post Poisoning attacks.                                                                                                                             |
 +|                     |     0 => ‘A.B.C.D         |                                                                                                                                                                                     |
 +|                     | ',                        |                                                                                                                                                                                     |
 +|                     |                           |                                                                                                                                                                                     |
 +|                     |   ),                      |                                                                                                                                                                                     |
 +|                     |                           |                                                                                                                                                                                     |
 +|                     |                           |                                                                                                                                                                                     |
 ++---------------------+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 +
diff --cc core/doc/admin/_sources/config/mail_parameters.txt
index 7257c34,0000000..55a1700
mode 100644,000000..100644
--- a/core/doc/admin/_sources/config/mail_parameters.txt
+++ b/core/doc/admin/_sources/config/mail_parameters.txt
@@@ -1,64 -1,0 +1,64 @@@
 +Mail Parameters
 +===============
 +
 +These parameters are related to ownCloud’s ability to send emails for lost passwords or file shares.
 +
 ++-------------------------+------------------------------------+--------------------------------------------------------------------------------------------------------------------------------+
 +| **Parameter**           | **Format**                         | **Description**                                                                                                                |
 +|                         |                                    |                                                                                                                                |
 ++-------------------------+------------------------------------+--------------------------------------------------------------------------------------------------------------------------------+
 +| **Mail Domain**         | "mail_domain" => "example.com",    | The domain to use when ownCloud sends emails.                                                                                  |
 +|                         |                                    | Emails can be sent in such instances as to share a public link, share notification or lost password.                           |
 +|                         |                                    |                                                                                                                                |
 ++-------------------------+------------------------------------+--------------------------------------------------------------------------------------------------------------------------------+
 +| **Mail SMTP Debug**     | "mail_smtpdebug" => false,         |                                                                                                                                |
 +|                         |                                    |                                                                                                                                |
 ++-------------------------+------------------------------------+--------------------------------------------------------------------------------------------------------------------------------+
 +| **Mail SMTP Mode**      | "mail_smtpmode" => "sendmail",     | The method used to send mail.                                                                                                  |
 +|                         |                                    | Valid values are smtp, php, sendmail and qmail.                                                                                |
 +|                         |                                    |                                                                                                                                |
 +|                         |                                    | If using local or remote SMTP, set to smtp.                                                                                    |
 +|                         |                                    |                                                                                                                                |
 +|                         |                                    | If using PHP mail it is necessary to have an installed and working email system on the server.                                 |
 +|                         |                                    | The program used to send email is defined in the PHP.ini file.                                                                 |
 +|                         |                                    |                                                                                                                                |
 +|                         |                                    | If using sendmail, it is necessary to have an installed and working email system on the server.                                |
- |                         |                                    | The sendmail binary is /usr/sbin/sendmail and should be installed on your *nix system.                                         |
++|                         |                                    | The sendmail binary is /usr/sbin/sendmail and should be installed on your Unix system.                                         |
 +|                         |                                    |                                                                                                                                |
- |                         |                                    | If using qmail to send email, the binary is /var/qmail/bin/sendmail and should be installed in your *nix system.               |
++|                         |                                    | If using qmail to send email, the binary is /var/qmail/bin/sendmail and should be installed in your Unix system.               |
 +|                         |                                    |                                                                                                                                |
 +|                         |                                    |                                                                                                                                |
 ++-------------------------+------------------------------------+--------------------------------------------------------------------------------------------------------------------------------+
 +| **Mail SMTP Host**      | "mail_smtphost" => "127.0.0.1",    | Mail server host.                                                                                                              |
 +|                         |                                    | May contain multiple hosts separated by a semi colon.                                                                          |
 +|                         |                                    | Also possible is to set the port used a particular host by following the host with a colon then the port number.               |
 +|                         |                                    |                                                                                                                                |
 +|                         |                                    |                                                                                                                                |
 ++-------------------------+------------------------------------+--------------------------------------------------------------------------------------------------------------------------------+
 +| **Mail SMTP Port**      | "mail_smtpport" => 25,             | Port used to communicate with the mail server.                                                                                 |
 +|                         |                                    |                                                                                                                                |
 ++-------------------------+------------------------------------+--------------------------------------------------------------------------------------------------------------------------------+
 +| **Mail SMTP TIMEOUT**   | "mail_smtptimeout" => 10,          | In the event that a malware or SPAM scanner is running on the SMTP server, it could be necessary to increase the SMTP timeout. |
 +|                         |                                    | That can be done using this parameter.                                                                                         |
 +|                         |                                    |                                                                                                                                |
 ++-------------------------+------------------------------------+--------------------------------------------------------------------------------------------------------------------------------+
 +| **Mail SMTP **          | "mail_smtpsecure" => "",           | Default value is no security.                                                                                                  |
 +| **Secure**              |                                    | May be ssl or tls depending                                                                                                    |
 +|                         |                                    | on the required level of security.                                                                                             |
 +|                         |                                    |                                                                                                                                |
 ++-------------------------+------------------------------------+--------------------------------------------------------------------------------------------------------------------------------+
 +| **MAIL SMPT AUTH**      | "mail_smtpauth" => false,          | Determine if the mail server requires authentication.                                                                          |
 +|                         |                                    | Default is false.                                                                                                              |
 +|                         |                                    | If true, the following parameters should be configured as well.                                                                |
 +|                         |                                    |                                                                                                                                |
 ++-------------------------+------------------------------------+--------------------------------------------------------------------------------------------------------------------------------+
 +| **Mail SMTP Auth Type** | "mail_smtpauthtype" => "LOGIN",    | If SMTP authentication is required, choose the authentication type as login (default) or plain.                                |
 +|                         |                                    |                                                                                                                                |
 ++-------------------------+------------------------------------+--------------------------------------------------------------------------------------------------------------------------------+
 +| **Mail SMTP Name**      | "mail_smtpname" => "username",     | The username to use when authentication is enabled.                                                                            |
 +|                         |                                    |                                                                                                                                |
 ++-------------------------+------------------------------------+--------------------------------------------------------------------------------------------------------------------------------+
 +| **Mail SMTP Password**  | "mail_smtppassword" => "password", | The password to use when authentication is enabled.                                                                            |
 +|                         |                                    |                                                                                                                                |
 ++-------------------------+------------------------------------+--------------------------------------------------------------------------------------------------------------------------------+
 +
diff --cc core/doc/admin/_sources/config/miscellaneous.txt
index fc97dd0,0000000..778a589
mode 100644,000000..100644
--- a/core/doc/admin/_sources/config/miscellaneous.txt
+++ b/core/doc/admin/_sources/config/miscellaneous.txt
@@@ -1,56 -1,0 +1,56 @@@
 +Miscellaneous
 +=============
 +
 +The remaining parameters are listed below.
 +
- +-------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
- | **Parameter**     | **Format**                                                                                                                                                                  | **Description**                                                                                                                                                                   |
- |                   |                                                                                                                                                                             |                                                                                                                                                                                   |
- +-------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
- | **Open SSL**      | 'openssl' => array(                                                                                                                                                         |                                                                                                                                                                                   |
- |                   |                                                                                                                                                                             |                                                                                                                                                                                   |
- |                   | //'config' => '/absolute/location/of/openssl.cnf',                                                                                                                          |                                                                                                                                                                                   |
- |                   |                                                                                                                                                                             |                                                                                                                                                                                   |
- |                   | ),                                                                                                                                                                          |                                                                                                                                                                                   |
- |                   |                                                                                                                                                                             |                                                                                                                                                                                   |
- +-------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
- | **User Backends** | 'user_backends'=>array(                                                                                                                                                     | It is possible to configure additional user backends in ownCloud.                                                                                                                 |
- |                   |                                                                                                                                                                             | The “External user Support” (user_external) app provides the following backends: IMAP (OC_User_IMAP), SMB (OC_User_SMB), FTP (OC_User_FTP).                                       |
- |                   | array(                                                                                                                                                                      |                                                                                                                                                                                   |
- |                   |                                                                                                                                                                             |                                                                                                                                                                                   |
- |                   | 'class'=>'OC_User_IMAP',                                                                                                                                                    |                                                                                                                                                                                   |
- |                   |                                                                                                                                                                             |                                                                                                                                                                                   |
- |                   | 'arguments'=>array('{imap.gmail.com:993/imap/ssl}INBOX'),                                                                                                                   |                                                                                                                                                                                   |
- |                   |                                                                                                                                                                             |                                                                                                                                                                                   |
- |                   | ),                                                                                                                                                                          |                                                                                                                                                                                   |
- |                   |                                                                                                                                                                             |                                                                                                                                                                                   |
- |                   | ),                                                                                                                                                                          |                                                                                                                                                                                   |
- |                   |                                                                                                                                                                             |                                                                                                                                                                                   |
- |                   |                                                                                                                                                                             |                                                                                                                                                                                   |
- +-------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
- | **CSP Policy**    | "custom_csp_policy" => "default-src 'self'; script-src 'self' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; frame-src *; img-src *; font-src 'self' data:; media-src *", |                                                                                                                                                                                   |
- |                   |                                                                                                                                                                             |                                                                                                                                                                                   |
- +-------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
- | **X Frame**       | “xframe_restriction" => true,                                                                                                                                               | XFrame-restriction is a header which                                                                                                                                              |
- |                   |                                                                                                                                                                             | prevents browsers from showing the site inside an iframe.                                                                                                                         |
- |                   |                                                                                                                                                                             | This may be used to prevent clickjacking.                                                                                                                                         |
- |                   |                                                                                                                                                                             |                                                                                                                                                                                   |
- +-------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
- | **Mem Cache**     | "memcached_server" => array('localhost', 11211),                                                                                                                            | Server details for one or more memcached servers to use for memory caching.                                                                                                       |
- |                   |                                                                                                                                                                             | Memcache is only used if other memory cache options (xcache, apc, apcu) are not available.                                                                                        |
- |                   |                                                                                                                                                                             |                                                                                                                                                                                   |
- +-------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
- | **Force SSL**     | "forcessl" => false,                                                                                                                                                        | If the admin checks “Enforce HTTPS” in the Admin page of the ownCloud WebUI. This will be set to true indicating that only HTTPS may be used to access this instance of ownCloud. |
- |                   |                                                                                                                                                                             | HTTP requests will be denied.                                                                                                                                                     |
- |                   |                                                                                                                                                                             |                                                                                                                                                                                   |
- +-------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
- | **Black List**    | "blacklisted_files" => array('.htaccess'),                                                                                                                                  | Files listed in this array will not be uploaded to ownCloud.                                                                                                                      |
- |                   |                                                                                                                                                                             | It should be noted that wildcards are not supported in this array.                                                                                                                |
- |                   |                                                                                                                                                                             | The configured must be exact file names to be blocked.                                                                                                                            |
- |                   |                                                                                                                                                                             | If wildcards are                                                                                                                                                                  |
- |                   |                                                                                                                                                                             | required, use the ownCloud firewall.                                                                                                                                              |
- |                   |                                                                                                                                                                             |                                                                                                                                                                                   |
- +-------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+++-------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
++| **Parameter**     | **Format**                                                                                                                                                                     | **Description**                                                                                                                                                                   |
++|                   |                                                                                                                                                                                |                                                                                                                                                                                   |
+++-------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
++| **Open SSL**      | 'openssl' => array(                                                                                                                                                            |                                                                                                                                                                                   |
++|                   |                                                                                                                                                                                |                                                                                                                                                                                   |
++|                   | //'config' => '/absolute/location/of/openssl.cnf',                                                                                                                             |                                                                                                                                                                                   |
++|                   |                                                                                                                                                                                |                                                                                                                                                                                   |
++|                   | ),                                                                                                                                                                             |                                                                                                                                                                                   |
++|                   |                                                                                                                                                                                |                                                                                                                                                                                   |
+++-------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
++| **User Backends** | 'user_backends'=>array(                                                                                                                                                        | It is possible to configure additional user backends in ownCloud.                                                                                                                 |
++|                   |                                                                                                                                                                                | The “External user Support” (user_external) app provides the following backends: IMAP (OC_User_IMAP), SMB (OC_User_SMB), FTP (OC_User_FTP).                                       |
++|                   | array(                                                                                                                                                                         |                                                                                                                                                                                   |
++|                   |                                                                                                                                                                                |                                                                                                                                                                                   |
++|                   | 'class'=>'OC_User_IMAP',                                                                                                                                                       |                                                                                                                                                                                   |
++|                   |                                                                                                                                                                                |                                                                                                                                                                                   |
++|                   | 'arguments'=>array('{imap.gmail.com:993/imap/ssl}INBOX'),                                                                                                                      |                                                                                                                                                                                   |
++|                   |                                                                                                                                                                                |                                                                                                                                                                                   |
++|                   | ),                                                                                                                                                                             |                                                                                                                                                                                   |
++|                   |                                                                                                                                                                                |                                                                                                                                                                                   |
++|                   | ),                                                                                                                                                                             |                                                                                                                                                                                   |
++|                   |                                                                                                                                                                                |                                                                                                                                                                                   |
++|                   |                                                                                                                                                                                |                                                                                                                                                                                   |
+++-------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
++| **CSP Policy**    | "custom_csp_policy" => "default-src 'self'; script-src 'self' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; frame-src \*; img-src \*; font-src 'self' data:; media-src \*", |                                                                                                                                                                                   |
++|                   |                                                                                                                                                                                |                                                                                                                                                                                   |
+++-------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
++| **X Frame**       | “xframe_restriction" => true,                                                                                                                                                  | XFrame-restriction is a header which                                                                                                                                              |
++|                   |                                                                                                                                                                                | prevents browsers from showing the site inside an iframe.                                                                                                                         |
++|                   |                                                                                                                                                                                | This may be used to prevent clickjacking.                                                                                                                                         |
++|                   |                                                                                                                                                                                |                                                                                                                                                                                   |
+++-------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
++| **Mem Cache**     | "memcached_server" => array('localhost', 11211),                                                                                                                               | Server details for one or more memcached servers to use for memory caching.                                                                                                       |
++|                   |                                                                                                                                                                                | Memcache is only used if other memory cache options (xcache, apc, apcu) are not available.                                                                                        |
++|                   |                                                                                                                                                                                |                                                                                                                                                                                   |
+++-------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
++| **Force SSL**     | "forcessl" => false,                                                                                                                                                           | If the admin checks “Enforce HTTPS” in the Admin page of the ownCloud WebUI. This will be set to true indicating that only HTTPS may be used to access this instance of ownCloud. |
++|                   |                                                                                                                                                                                | HTTP requests will be denied.                                                                                                                                                     |
++|                   |                                                                                                                                                                                |                                                                                                                                                                                   |
+++-------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
++| **Black List**    | "blacklisted_files" => array('.htaccess'),                                                                                                                                     | Files listed in this array will not be uploaded to ownCloud.                                                                                                                      |
++|                   |                                                                                                                                                                                | It should be noted that wildcards are not supported in this array.                                                                                                                |
++|                   |                                                                                                                                                                                | The configured must be exact file names to be blocked.                                                                                                                            |
++|                   |                                                                                                                                                                                | If wildcards are                                                                                                                                                                  |
++|                   |                                                                                                                                                                                | required, use the ownCloud firewall.                                                                                                                                              |
++|                   |                                                                                                                                                                                |                                                                                                                                                                                   |
+++-------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 +
 +
 +
diff --cc core/doc/admin/_sources/configuration/xsendfile.txt
index fd5e75d,0000000..3e910a1
mode 100644,000000..100644
--- a/core/doc/admin/_sources/configuration/xsendfile.txt
+++ b/core/doc/admin/_sources/configuration/xsendfile.txt
@@@ -1,120 -1,0 +1,120 @@@
 +Serving static files via web server
 +===================================
 +Since ownCloud 5 it is possible to let web servers handle static file serving.
 +This should generally improve performance (web servers are optimized for this) and in some cases permits controlled
 +file serving (i.e. pause and resume downloads).
 +
- .. note :: This feature can currently only be activated for local files, i.e. files inside the **data/** directory
- and local mounts. Controlled file serving **does not work for generated zip files**. This is due to how temporary files are created.
++.. note:: This feature can currently only be activated for local files, i.e. files inside the **data/** directory
++   and local mounts. Controlled file serving **does not work for generated zip files**. This is due to how temporary files are created.
 +
 +Apache2 (X-Sendfile)
 +--------------------
 +It is possible to let Apache handle static file serving via `mod_xsendfile <https://tn123.org/mod_xsendfile/>`_.
 +
 +Installation
 +~~~~~~~~~~~~
 +On Debian and Ubuntu systems use:
 +
 +.. code-block:: bash
 +
 +   apt-get install libapache2-mod-xsendfile
 +
 +
 +Configuration
 +~~~~~~~~~~~~~
 +Configuration of mod_xsendfile for ownCloud depends on its version.
 +For versions below 0.10 (Debian squeeze ships with 0.9)
 +
 +.. code-block:: xml
 +
 +    <Directory /var/www/owncloud>
 +        ...
 +        SetEnv MOD_X_SENDFILE_ENABLED 1
 +        XSendFile On
 +        XSendFileAllowAbove On
 +    </Directory>
 +
 +For versions >=0.10 (e.g. Ubuntu 12.10)
 +
 +.. code-block:: xml
 +
 +    <Directory /var/www/owncloud>
 +        ...
 +        SetEnv MOD_X_SENDFILE_ENABLED 1
 +        XSendFile On
 +        XSendFilePath /tmp/oc-noclean
 +        XSendFilePath /home/valerio
 +    </Directory>
 +
 +* **SetEnv MOD_X_SENDFILE_ENABLED**: tells ownCloud scripts that they should add the X-Sendfile header when serving files
 +* **XSendFile**: enables web server handling of X-Sendfile headers (and therefore file serving) for the specified Directory
 +* **XSendFileAllowAbove (<0.10)**: enables file serving through web server on path outside the specified Directory. This is needed for PHP temporary directory where zip files are created and for configured local mounts which may reside outside data directory
 +* **XSendFilePath (>=0.10)**: a white list of paths that the web server is allowed to serve outside of the specified Directory. At least PHP temporary directory concatenated with *oc-noclean* must be configured. Temporary zip files will be created inside this directory when using mod_xsendfile. Other paths which correspond to local mounts should be configured here as well. For a more in-dept documentation of this directive refer to mod_xsendfile website linked above
 +
 +
 +LigHTTPd (X-Sendfile2)
 +----------------------
 +LigHTTPd uses similar headers to Apache2, apart from the fact that it does not handle partial downloads in the same way
 +Apache2 does. For this reason, a different method is used for LigHTTPd.
 +
 +Installation
 +~~~~~~~~~~~~
 +X-Sendfile and X-Sendfile2 are supported by default in LigHTTPd and no additional operation should be needed to install it.
 +
 +Configuration
 +~~~~~~~~~~~~~
 +Your server configuration should include the following statements::
 +
 +      fastcgi.server          = ( ".php" => ((
 +         ...
 +         "allow-x-send-file" => "enable",
 +         "bin-environment" => (
 +            "MOD_X_SENDFILE2_ENABLED" => "1",
 +         ),
 +      )))
 +
 +* **allow-x-send-file**: enables LigHTTPd to use X-Sendfile and X-Sendfile2 headers to serve files
 +* **bin-environment**: is used to parse MOD_X_SENDFILE2_ENABLED to the ownCloud backend, to make it use the X-Sendfile and X-Sendfile2 headers in it's response
 +
 +
 +Nginx (X-Accel-Redirect)
 +------------------------
 +Nginx supports handling of static files differently from Apache. Documentation can be found in the Nginx Wiki
 +section `Mod X-Sendfile <http://wiki.nginx.org/XSendfile>`_ and section `X-Accell <http://wiki.nginx.org/X-accel>`_.
 +The header used by Nginx is X-Accel-Redirect.
 +
 +Installation
 +~~~~~~~~~~~~
 +X-Accel-Redirect is supported by default in Nginx and no additional operation should be needed to install it.
 +
 +Configuration
 +~~~~~~~~~~~~~
 +Configuration is similar to Apache::
 +
 +    location ~ \.php$ {
 +        ...
 +        fastcgi_param MOD_X_ACCEL_REDIRECT_ENABLED on;
 +    }
 +
 +    location ~ ^/home/valerio/(owncloud/)?data {
 +        internal;
 +        root /;
 +    }
 +
 +    location ~ ^/tmp/oc-noclean/.+$ {
 +        internal;
 +        root /;
 +    }
 +
 +
 +* **fastcgi_param MOD_X_ACCEL_REDIRECT_ENABLED:** tells ownCloud scripts that they should add the X-Accel-Redirect header when serving files
 +
 +* **internal location:** each directory that contains local user data should correspond to an internal location. In the example uses the following directories:
 +
 +  * **/home/valerio/owncloud/data**: ownCloud data directory
 +  * **/home/valerio/data**: a local mount
 +  * **/tmp/oc-noclean**: PHP temporary directory concatenated with *oc-noclean*. Temporary zip files will be created inside this directory when using X-Accel-Redirect
 +
 +How to check if it's working?
 +-----------------------------
 +You are still able to download stuff via the web interface and single, local file downloads can be paused and resumed.
diff --cc core/doc/admin/_sources/contents.txt
index 1fccb2d,0000000..fe97397
mode 100644,000000..100644
--- a/core/doc/admin/_sources/contents.txt
+++ b/core/doc/admin/_sources/contents.txt
@@@ -1,25 -1,0 +1,28 @@@
 +.. _contents:
 +
 +===============================
 +ownCloud documentation contents
 +===============================
 +
 +.. toctree::
 +    :hidden:
 +
 +    index
 +
 +.. toctree::
 +    :maxdepth: 3
 +
 +    installation/index
 +    configuration/index
 +    apps/index
 +    maintenance/index
++    cron/index
++    quota/index
++    sharing_api/index
 +    config/index
 +    issues/index
 +
 +Indices and tables
 +==================
 +
 +* :ref:`genindex`
diff --cc core/doc/admin/_sources/cron/index.txt
index 7c2a94e,0000000..7751254
mode 100644,000000..100644
--- a/core/doc/admin/_sources/cron/index.txt
+++ b/core/doc/admin/_sources/cron/index.txt
@@@ -1,37 -1,0 +1,37 @@@
 +========================
 +Driving Events with Cron
 +========================
 +
 +Introduction
 +============
 +
 +ownCloud is written in PHP, and because PHP is a request driven language – in
 +other words it runs only when a client takes an action and calls php, and then
 +it executes and ends – it does not have a built in CRON process. Instead,
 +ownCloud provides ``cron.php``, which is called by the server’s CRON daemon.
 +``cron.php`` is an ownCloud internal process that runs various background jobs
 +on demand.  It is called by the server cron, and can be set by the
 +administrator.
 +
 +ownCloud plug-in applications register actions with ``cron.php`` automatically to
 +take care of typical housekeeping operations, such as garbage collecting of
 +temporary files or checking for newly updated files using ``filescan()`` for
 +externally mounted file systems.
 +
 +Usage
 +=====
 +
 +The interval at which this script is executed, and thus the ownCloud registered
 +actions, can depend on the size of the installation and the load of the system.
 +Recommended intervals are 15 or 30 minutes.
 +
 +Cron.php needs to be called by the system’s cron daemon and run as the same
 +user the web server runs as.
 +
 +As an example, on an ordinary Linux distribution, place the following in the
- webserver’s user’s crontab::
++web server’s user’s crontab::
 +
 +    */15 * * * * /usr/bin/php -f /srv/http/owncloud/cron.php /dev/null 2>&1
 +
 +This will run ``cron.php`` every 15 minutes and suppress any warnings or output
 +which may be generated.
diff --cc core/doc/admin/_sources/index.txt
index 913261c,0000000..334f659
mode 100644,000000..100644
--- a/core/doc/admin/_sources/index.txt
+++ b/core/doc/admin/_sources/index.txt
@@@ -1,100 -1,0 +1,102 @@@
 +======================================
 +ownCloud |version| Admin Documentation
 +======================================
 +
 +Introduction
 +============
 +
 +This is the administrators manual for ownCloud, a flexible, open source file
 +sync and share solution. It comprises of the ownCloud server, as well as client
 +applications for Microsoft Windows, Mac OS X and Linux (Desktop Client) and
 +mobile clients for the Android and Apple iOS operating system.
 +
 +Target audience
 +---------------
 +
 +This guide is targeted towards people who want to install, administer and
 +optimize ownCloud Server. If you want to learn how to use the Web UI, or how to
 +install clients on the server, please refer to the `User Manual`_ or the `Desktop
 +Client Manual`_ respectively.
 +
 +.. _`User Manual`: http://doc.owncloud.com/
 +.. _`Desktop Client Manual`: http://doc.owncloud.com/
 +
 +Structure of this document
 +--------------------------
 +
 +The next chapters describes how to set up ownCloud Server on different platforms
 +and operating systems, as well as how to update existing installations.
 +
 +Further chapters will then detail on integrating ownCloud into your existing
 +environment, e.g. how to setup LDAP or how to mount your storage.
 +
 +
 +Installation
 +============
 +This chapter will introduce you to the installation of ownCloud in different scenarios.
 +
 +If you want to just try ownCloud in a virtual machine without any configuration, check the section
 +:doc:`installation/installation_appliance`, where you will find ready-to-use images.
 +
 +* :doc:`installation/installation_linux` (recommended)
 +* :doc:`installation/installation_windows`
 +* :doc:`installation/installation_source`
 +* :doc:`installation/installation_others`
 +* :doc:`installation/installation_ucs`
 +* :doc:`installation/installation_macos` (not supported)
 +* :doc:`installation/installation_appliance`
 +
 +Configuration
 +=============
 +This chapter covers ownCloud and web server configuration.
 +
 +* :doc:`configuration/configuration_apps`
 +* :doc:`configuration/configuration_users`
 +* :doc:`configuration/configuration_database`
 +* :doc:`configuration/auth_ldap`
++* :doc:`cron/index`
++* :doc:`quota/index`
 +* :doc:`configuration/custom_mount_config_gui`
 +* :doc:`configuration/custom_mount_config`
 +* :doc:`configuration/background_jobs`
 +* :doc:`configuration/configuration_mail`
 +* :doc:`configuration/configuration_automation`
 +* :doc:`configuration/configuration_encryption`
 +* :doc:`configuration/configuring_big_file_upload`
 +* :doc:`configuration/configuration_reverseproxy`
 +* :doc:`configuration/xsendfile`
 +* :doc:`configuration/configuration_3rdparty`
 +* :doc:`configuration/custom_user_backend`
 +* :doc:`configuration/configuration_custom_clients`
 +* :doc:`configuration/configuration_maintenance`
 +* :doc:`configuration/configuration_knowledgebase`
 +* :doc:`configuration/configuration_logging`
 +* :doc:`configuration/configuration_language`
 +
 +Finally, the chapter :doc:`config/index` details on the switches
 +in the ``config.php`` file.
 +
 +Apps
 +====
 +This chapter covers individual ownCloud apps.
 +
 +* :doc:`apps/activity/index`
 +* :doc:`apps/admin_dependencies_chk/index`
 +* :doc:`apps/files_antivirus/index`
 +* :doc:`apps/files_encryption/index`
 +* :doc:`apps/files_external/index`
 +* :doc:`apps/files_sharing/index`
 +* :doc:`apps/files_trashbin/index`
 +* :doc:`apps/files_versions/index`
 +* :doc:`apps/firstrunwizard/index`
 +* :doc:`apps/user_ldap/index`
 +* :doc:`apps/viewers/index`
 +
 +Maintenance
 +===========
 +This chapter covers maintenance tasks such as updating or migrating to a new version.
 +
 +* :doc:`maintenance/migrating`
 +* :doc:`maintenance/update`
 +
 +
diff --cc core/doc/admin/_sources/installation/installation_ucs.txt
index 06564f7,0000000..4046d86
mode 100644,000000..100644
--- a/core/doc/admin/_sources/installation/installation_ucs.txt
+++ b/core/doc/admin/_sources/installation/installation_ucs.txt
@@@ -1,169 -1,0 +1,169 @@@
 +Univention Corporate Server
 +---------------------------
 +
 +Subscribers to the ownCloud Enterprise edition can also integrate with
 +:abbr:`UCS (Univention Corporate Server)`.
 +
 +.. _preconfig:
 +
 +Pre configuration
 +^^^^^^^^^^^^^^^^^
 +
 +ownCloud makes use of the UCR, the Univention Configuration Registry. The values
 +are being read during installation, most of them can be changed later, too.
 +Changes done directly via ownCloud are not taken over to UCR. We think we found
 +sane defaults, nevertheless you might have your own requirements. The
 +installation script will listen to the UCR keys listed below. In case you want
 +to override any default setting, simply add the key in question to the UCR and
 +assign your required value.
 +
 +.. tabularcolumns:: |l|p{5cm}|p{5cm}|l|
 +.. cssclass:: longtable
 +.. csv-table::
 +  :header: Key, Default, Description, Introduced
 +  :widths: 20, 30, 30, 20
 +
 +  "owncloud/directory/data", "/var/lib/owncloud", "Specifies where the file storage will be placed", "2012.0.1"
 +  "owncloud/db/name",   "owncloud",	"Name of the MySQL database. ownCloud will create an own user for it.",	2012.0.1
 +  "owncloud/user/quota",	"(empty)",	"The default quota, when a user is being added. Assign values in human readable strings, e.g. “2 GB”. Unlimited if empty.",	2012.0.1
-   "owncloud/user/enabled",	0,	"Wether a new user is allowed to use ownCloud by default.",	2012.0.1
-   "owncloud/group/enabled",	"0",	"Wether a new group is allowed to be used in ownCloud by default.",	2012.4.0.4
++  "owncloud/user/enabled",	0,	"Whether a new user is allowed to use ownCloud by default.",	2012.0.1
++  "owncloud/group/enabled",	"0",	"Whether a new group is allowed to be used in ownCloud by default.",	2012.4.0.4
 +  "owncloud/ldap/base/users",	"cn=users,$ldap_base",	"The users-subtree in the LDAP directory. If left blank it will fall back to the LDAP base.",	2012.4.0.4
 +  "owncloud/ldap/base/groups",	"cn=groups,$ldap_base",	"The groups-subtree in the LDAP directory. If left blank it will fall back to the LDAP base.",	2012.4.0.4
 +  "owncloud/ldap/groupMemberAssoc",	"uniqueMember",	"The LDAP attribute showing the group-member relationship. Possible values: uniqueMember, memberUid and member",	2012.4.0.4
 +  "owncloud/ldap/tls",	1,	"Whether to talk to the LDAP server via TLS.",	2012.0.1
 +  "owncloud/ldap/disableMainServer",	0,	"Deactivates the (first) LDAP Configuration",	5.0.9
 +  "owncloud/ldap/cacheTTL",	600,	"Lifetime of the ownCloud LDAP Cache in seconds",	5.0.9
 +  "owncloud/ldap/UUIDAttribute",	"(empty)",	"Attribute that provides a unique value for each user and group entry. Empty value for autodetection.",	5.0.9
 +  "owncloud/ldap/loginFilter",	"(&(\|(&(objectClass=posixAccount) (objectClass=shadowAccount)) (objectClass=univentionMail) (objectClass=sambaSamAccount) (objectClass=simpleSecurityObject) (&(objectClass=person) (objectClass=organizationalPerson) (objectClass=inetOrgPerson))) (!(uidNumber=0)) (!(uid=*$)) (&(uid=%uid) (ownCloudEnabled=1)))",	"The LDAP filter that shall be used when a user tries to log in.",	2012.0.1
 +  "owncloud/ldap/userlistFilter",	"(&(\|(&(objectClass=posixAccount) (objectClass=shadowAccount)) (objectClass=univentionMail) (objectClass=sambaSamAccount) (objectClass=simpleSecurityObject) (&(objectClass=person) (objectClass=organizationalPerson) (objectClass=inetOrgPerson))) (!(uidNumber=0))(!(uid=*$)) (&(ownCloudEnabled=1)))",	"The LDAP filter that shall be used when the user list is being retrieved (e.g. for sharing)",	2012.0.1
 +  "owncloud/ldap/groupFilter",	"(&(objectClass=posixGroup) (ownCloudEnabled=1))",	"The LDAP filter that shall be used when the group list is being retrieved (e.g. for sharing)",	2012.4.0.4
 +  "owncloud/ldap/internalNameAttribute",	"uid",	"Attribute that should be used to create the user's owncloud internal name",	5.0.9
 +  "owncloud/ldap/displayName",	"uid", "The LDAP attribute that should be displayed as name in ownCloud",	2012.0.1
 +  "owncloud/ldap/user/searchAttributes",	"uid,givenName,sn,description,employeeNumber,mailPrimaryAddress",	"Attributes taken into consideration when searching for users (comma separated)",	5.0.9
 +  "owncloud/ldap/user/quotaAttribute",	"ownCloudQuota",	"Name of the quota attribute. The default attribute is provided by owncloud-schema.",	5.0.9
 +  "owncloud/ldap/user/homeAttribute",	"(empty)",	"Attribute that should be used to create the user's owncloud internal home folder",	5.0.9
 +  "owncloud/ldap/group/displayName",	"cn",	"The LDAP attribute that should be used as groupname in ownCloud",	2012.4.0.4
 +  "owncloud/ldap/group/searchAttributes",	"cn,description, mailPrimaryAddress",	"Attributes taken into consideration when searching for groups (comma separated)",	5.0.9
-   "owncloud/join/users/update",	"yes",	"Wether ownCloud LDAP schema should be applied to existing users",	2012.0.1
-   "owncloud/group/enableDomainUsers",	"1",	"Wether the group “Domain Users” shall be enabled for ownCloud on install",	2012.4.0.4
++  "owncloud/join/users/update",	"yes",	"Whether ownCloud LDAP schema should be applied to existing users",	2012.0.1
++  "owncloud/group/enableDomainUsers",	"1",	"Whether the group “Domain Users” shall be enabled for ownCloud on install",	2012.4.0.4
 +  "owncloud/join/users/filter",	"(&(\|(&(objectClass=posixAccount) (objectClass=shadowAccount)) (objectClass=univentionMail) (objectClass=sambaSamAccount) (objectClass=simpleSecurityObject) (&(objectClass=person) (objectClass=organizationalPerson) (objectClass=inetOrgPerson))) (!(uidNumber=0)) (!(\|(uid=*$) (uid=owncloudsystemuser) (uid=join-backup) (uid=join-slave))) (!(objectClass=ownCloudUser)))",	"Filters, on which LDAP users the ownCloud schema should be applied to. The default exc [...]
 +  "owncloud/join/groups/filter",	"(empty)",	"Filters which LDAP groups will be en/disabled for ownCloud when running the script /usr/share/owncloud/update-groups.sh",	2012.4.0.4
 +
 +If you want to override the default settings, simply create the key in
 +question in the UCR and assign your required value, for example::
 +
 +  ucr set owncloud/user/enabled=1
 +
 +or via UMC:
 +
- .. image:: /images/ucsint2.png
++.. image:: images/ucsint2.png
 +
 +
 +Installation
 +^^^^^^^^^^^^
 +
 +Now, we are ready to install ownCloud. This can be either done through the UCS
 +App Center (recommended) or by downloading the packages.
 +
 +UCS App Center
 +""""""""""""""
 +
 +Open the Univention Management Console and choose the App Center module. You
 +will see a variety of available applications, including ownCloud.
 +
- .. image:: /images/ucs-app-center-module.png
++.. image:: images/ucs-app-center-module.png
 +
 +Click on ownCloud 5 and follow the instructions.
 +
- .. image:: /images/ucs-app-center-install.png
++.. image:: images/ucs-app-center-install.png
 +
 +In the UCS App Center, you can also upgrade from ownCloud 4.5 by installing
 +ownCloud 5.0. They are provided as separate apps. It is only possible to have
 +one version of ownCloud installed.
 +
 +Manually by download
 +""""""""""""""""""""
 +
 +Download the integration packages `from our website`_ and install them from
 +within your download folder (note: the package owncloud-unsupported is
 +optional) via command line:
 +
 +::
 +
 +	dpkg -i owncloud*.deb
 +
 +ownCloud will be configured to fully work with LDAP.
 +
 +
- Reinstallation
- """"""""""""""
++Re-installation
++"""""""""""""""
 +
 +When ownCloud was installed before and uninstalled via AppCenter or via command
 +line using apt-get remove, ownCloud can be simply installed again. The old
 +configuration will be used again.
 +
 +When an older ownCloud was installed and has been purged (only possible via
 +command line using apt-get purge) the old configuration is gone, but data is
 +left. This blocks an installation. You can either install the old version and
 +upgrade to ownCloud 5 or (re)move the old data. This is done by removing the
 +MySQL database "ownCloud" using the command line:
 +
 +::
 +
 +	mysql -u root -e "DROP DATABASE owncloud" -p`tail /etc/mysql.secret
 +
 +In this case you probably also want to remove the data directory
 +**/var/lib/owncloud** although this is not mandatory.
 +
- Postconfiguration (optional)
- ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
++Post configuration (optional)
++^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 +
 +There is only one local admin user “owncloudadmin”, you can find his password in
 +`/etc/owncloudadmin.secret`. Use this account, if you want to change basic
 +ownCloud settings.
 +
 +In the installation process a virtual host is set up (Apache is required
 +therefore). If you want to modify the settings, edit
 +:file:`/etc/apache2/sites-available/owncloud` and restart the web server. You
 +might want to do it to enable HTTPS connections. Besides that, you can edit the
 +**.htaccess-File in /var/www/owncloud/**. In the latter file there are also the
 +PHP limits for file transfer specified.
 +
 +Using ownCloud
 +^^^^^^^^^^^^^^
 +If you decided to enable every user by default to use ownCloud, simply
 +open up http://myserver.com/owncloud/ and log in with your LDAP
 +credentials and enjoy.
 +
 +If you did not, go to the UMC and enable the users who shall have access
 +(see picture below). Then, login at http://myserver.com/owncloud/ with
 +your LDAP credentials.
 +
- .. image:: /images/ucsint1.png
++.. image:: images/ucsint1.png
 +
 +Updating users can also be done by the script
 +:file:`/usr/share/owncloud/update-users.sh` . It takes the following UCR
 +variables as parameters: **owncloud/user/enabled** for enabling or disabling,
 +**owncloud/user/quota** as the Quota value and **owncloud/join/users/filter** as
 +LDAP filter to select the users to update.
 +
 +Groups 2012.4.0.4
 +"""""""""""""""""
 +
 +Since ownCloud Enterprise 2012.4.0.4 group support is enabled. Groups,
 +that are activated for ownCloud usage, can be used to share files to
 +instead of single users, for example. It is also important to note, that
 +users can only share within groups where they belong to. Groups can be
 +enabled and disabled via UCM as shown in the screen shot below.
 +
- .. image:: /images/ucsint.png
++.. image:: images/ucsint.png
 +
 +Another way to enable or disable groups is to use the script
 +:file:`/usr/share/owncloud/update-groups.sh`. Currently, it takes an argument
 +which can be 1=enable groups or 0=disable groups. The filter applied is being
 +taken from the UCR variable **owncloud/join/groups/filter**. In case it is
 +empty, a message will be displayed.
 +
 +
 +.. _from our website: https://owncloud.com/download
diff --cc core/doc/admin/apps/activity/index.html
index 9aaa67f,0000000..4775b32
mode 100644,000000..100644
--- a/core/doc/admin/apps/activity/index.html
+++ b/core/doc/admin/apps/activity/index.html
@@@ -1,245 -1,0 +1,248 @@@
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>Activity — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="../../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../../_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="../../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../../_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '../../',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="../../_static/jquery.js"></script>
 +    <script type="text/javascript" src="../../_static/underscore.js"></script>
 +    <script type="text/javascript" src="../../_static/doctools.js"></script>
 +    <script type="text/javascript" src="../../_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../../index.html" />
 +    <link rel="up" title="Apps" href="../index.html" />
 +    <link rel="next" title="Finding Deployment Dependencies" href="../admin_dependencies_chk/index.html" />
 +    <link rel="prev" title="Apps" href="../index.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="../../contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="../../contents.html">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="../../index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
 +<ul class="current">
 +<li class="toctree-l1"><a class="reference internal" href="../../installation/index.html">Installation</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../../configuration/index.html">Configuration</a></li>
 +<li class="toctree-l1 current"><a class="reference internal" href="../index.html">Apps</a><ul class="current">
 +<li class="toctree-l2 current"><a class="current reference internal" href="">Activity</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="#configuration">Configuration</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="#utilization">Utilization</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="#rss-feed">RSS Feed</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="../admin_dependencies_chk/index.html">Finding Deployment Dependencies</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../files_antivirus/index.html">File Antivirus Engine</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../files_encryption/index.html">Encryption</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../files_external/index.html">External storage support</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../files_sharing/index.html">Sharing</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../files_trashbin/index.html">Deleted Files</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../files_versions/index.html">Versions</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../firstrunwizard/index.html">First Run Wizard</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../user_ldap/index.html">LDAP user and group backend</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../viewers/index.html">File Viewers</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l1"><a class="reference internal" href="../../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../sharing_api/index.html">Sharing API</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../../config/index.html">The Configuration File</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../../issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <div class="section" id="activity">
 +<h1>Activity<a class="headerlink" href="#activity" title="Permalink to this headline">¶</a></h1>
 +<p>The ownCloud Activity app shows an activity feed where users can see what they did in the past and what happened to
 +their files and what others did with their shared files.</p>
 +<p>The Activity Stream introduces a central interface where all events that happen in a user’s ownCloud instance are shown.</p>
 +<p>The following can be seen in the new interface:</p>
 +<ul class="simple">
 +<li>Creation, edit or deletion of files along with a thumbnail and date and path</li>
 +<li>If someone shared a file with you</li>
 +<li>If someone created, edited or deleted something in a folder you shared to them.</li>
 +</ul>
 +<p>All the events are presented with endless scrolling and also in an RSS feed which a user can subscribe to.</p>
 +<div class="section" id="configuration">
 +<h2>Configuration<a class="headerlink" href="#configuration" title="Permalink to this headline">¶</a></h2>
 +<p>The Activity App is enabled by default.  To verify or to disable, navigate to the APPS page and search for <tt class="docutils literal"><span class="pre">Activity</span></tt>.</p>
 +<img alt="../../_images/10000000000002F3000000926CA65D02.png" src="../../_images/10000000000002F3000000926CA65D02.png" style="width: 6.5in; height: 1.2571in;" />
 +</div>
 +<div class="section" id="utilization">
 +<h2>Utilization<a class="headerlink" href="#utilization" title="Permalink to this headline">¶</a></h2>
 +<p>The Activities can be viewed by selecting
 +Activity
 +in the App bar on the left side of the ownCloud browser interface</p>
 +<p><img alt="1000000000000050000000DB83B8FA5B_png" src="../../_images/1000000000000050000000DB83B8FA5B.png" style="width: 0.8335in; height: 2.2811in;" /></p>
 +<p>This will bring up the Activity interface showing all the activities which occurred for this user’s instance.</p>
 +<div class="section" id="sample-activities">
 +<h3>Sample Activities<a class="headerlink" href="#sample-activities" title="Permalink to this headline">¶</a></h3>
 +<p>This section will show how the different activities may appear within this interface</p>
 +<div class="section" id="create-file">
 +<h4>Create file<a class="headerlink" href="#create-file" title="Permalink to this headline">¶</a></h4>
 +<p>The following shows a file entitled
 +DeleteMe.txt
 +being created 3 days ago.</p>
 +<p><img alt="10000000000000F300000068AF0ECD53_png" src="../../_images/10000000000000F300000068AF0ECD53.png" style="width: 2.5311in; height: 1.0835in;" /></p>
 +</div>
 +<div class="section" id="delete-file">
 +<h4>Delete File<a class="headerlink" href="#delete-file" title="Permalink to this headline">¶</a></h4>
 +<p>The following shows a file entitled <tt class="docutils literal"><span class="pre">DeleteMe.txt</span></tt> being deleted 3 days ago.</p>
 +<p><img alt="10000000000000F5000000675DC5F68C_png" src="../../_images/10000000000000F5000000675DC5F68C.png" style="width: 2.552in; height: 1.0728in;" /></p>
 +</div>
 +<div class="section" id="edit-a-file">
 +<h4>Edit a file<a class="headerlink" href="#edit-a-file" title="Permalink to this headline">¶</a></h4>
 +<p>The following shows a file <tt class="docutils literal"><span class="pre">Shared/test.txt</span></tt> being edited mere seconds ago.</p>
 +<p><img alt="10000000000000F1000000F6704F46D3_png" src="../../_images/10000000000000F1000000F6704F46D3.png" style="width: 2.5102in; height: 2.5626in;" /></p>
 +</div>
 +<div class="section" id="share-a-file-with-a-user">
 +<h4>Share a file with a user<a class="headerlink" href="#share-a-file-with-a-user" title="Permalink to this headline">¶</a></h4>
 +<p>The following shows the file <tt class="docutils literal"><span class="pre">shareMe</span></tt> being shared with another user.</p>
 +<p><img alt="10000000000000F1000000F56125BDBA_png" src="../../_images/10000000000000F1000000F56125BDBA.png" style="width: 2.5102in; height: 2.552in;" /></p>
 +</div>
 +<div class="section" id="file-shared-to-user">
 +<h4>File shared to user<a class="headerlink" href="#file-shared-to-user" title="Permalink to this headline">¶</a></h4>
 +<p>The following shows the file <tt class="docutils literal"><span class="pre">Shared/test.txt</span></tt> being shared with this user almost an hour ago.</p>
 +<p><img alt="10000000000000F60000006754ED2A1E_png" src="../../_images/10000000000000F60000006754ED2A1E.png" style="width: 2.5626in; height: 1.0728in;" /></p>
 +</div>
 +<div class="section" id="file-created-by-another-user-in-shared-folder">
 +<h4>File created by another user in Shared folder<a class="headerlink" href="#file-created-by-another-user-in-shared-folder" title="Permalink to this headline">¶</a></h4>
 +<p>The following is shown when another user creates a file in your shared folder.</p>
 +<p><img alt="10000000000000F500000067A8845EF8_png" src="../../_images/10000000000000F500000067A8845EF8.png" style="width: 2.552in; height: 1.0728in;" /></p>
 +</div>
 +<div class="section" id="shared-file-modified">
 +<h4>Shared file modified<a class="headerlink" href="#shared-file-modified" title="Permalink to this headline">¶</a></h4>
 +<p>The following shows a file <tt class="docutils literal"><span class="pre">BoB/test.txt</span></tt> modified by a user who this file was shared to.</p>
 +<p><img alt="10000000000000F6000000685DFB3767_png" src="../../_images/10000000000000F6000000685DFB3767.png" style="width: 2.5626in; height: 1.0835in;" /></p>
 +</div>
 +<div class="section" id="combined-activities">
 +<h4>Combined activities<a class="headerlink" href="#combined-activities" title="Permalink to this headline">¶</a></h4>
 +<p>The following shows what “combined” activities may look like on the activity interface.</p>
 +<p><img alt="10000000000000F40000019A110DD159_png" src="../../_images/10000000000000F40000019A110DD159.png" style="width: 2.5417in; height: 4.2701in;" /></p>
 +</div>
 +</div>
 +</div>
 +<div class="section" id="rss-feed">
 +<h2>RSS Feed<a class="headerlink" href="#rss-feed" title="Permalink to this headline">¶</a></h2>
 +<p>To subscribe to the RSS Feed, navigate to the <tt class="docutils literal"><span class="pre">Activity</span></tt> page and select <tt class="docutils literal"><span class="pre">RSS</span> <span class="pre">feed</span></tt> in the upper right of the
 +browser.</p>
 +<p><img alt="10000000000001440000005A2989832F_png" src="../../_images/10000000000001440000005A2989832F.png" style="width: 3.3752in; height: 0.9374in;" /></p>
 +<p>The resulting page will look something like this:</p>
 +<p><img alt="10000000000002B1000002258C08D304_png" src="../../_images/10000000000002B1000002258C08D304.png" style="width: 6.5in; height: 5.1791in;" /></p>
 +<p>To subscribe, select the <tt class="docutils literal"><span class="pre">Subscribe</span> <span class="pre">Now</span></tt> button.  The RSS Feed may be viewed via the browser’s capabilities.</p>
 +</div>
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/apps/admin_dependencies_chk/index.html
index 1f36e9e,0000000..99e945c
mode 100644,000000..100644
--- a/core/doc/admin/apps/admin_dependencies_chk/index.html
+++ b/core/doc/admin/apps/admin_dependencies_chk/index.html
@@@ -1,184 -1,0 +1,187 @@@
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>Finding Deployment Dependencies — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="../../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../../_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="../../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../../_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '../../',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="../../_static/jquery.js"></script>
 +    <script type="text/javascript" src="../../_static/underscore.js"></script>
 +    <script type="text/javascript" src="../../_static/doctools.js"></script>
 +    <script type="text/javascript" src="../../_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../../index.html" />
 +    <link rel="up" title="Apps" href="../index.html" />
 +    <link rel="next" title="File Antivirus Engine" href="../files_antivirus/index.html" />
 +    <link rel="prev" title="Activity" href="../activity/index.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="../../contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="../../contents.html">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="../../index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
 +<ul class="current">
 +<li class="toctree-l1"><a class="reference internal" href="../../installation/index.html">Installation</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../../configuration/index.html">Configuration</a></li>
 +<li class="toctree-l1 current"><a class="reference internal" href="../index.html">Apps</a><ul class="current">
 +<li class="toctree-l2"><a class="reference internal" href="../activity/index.html">Activity</a></li>
 +<li class="toctree-l2 current"><a class="current reference internal" href="">Finding Deployment Dependencies</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="#configuration">Configuration</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="#utilization">Utilization</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="../files_antivirus/index.html">File Antivirus Engine</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../files_encryption/index.html">Encryption</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../files_external/index.html">External storage support</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../files_sharing/index.html">Sharing</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../files_trashbin/index.html">Deleted Files</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../files_versions/index.html">Versions</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../firstrunwizard/index.html">First Run Wizard</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../user_ldap/index.html">LDAP user and group backend</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../viewers/index.html">File Viewers</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l1"><a class="reference internal" href="../../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../sharing_api/index.html">Sharing API</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../../config/index.html">The Configuration File</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../../issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <div class="section" id="finding-deployment-dependencies">
 +<h1>Finding Deployment Dependencies<a class="headerlink" href="#finding-deployment-dependencies" title="Permalink to this headline">¶</a></h1>
 +<p>The ownCloud Dependencies App provides a list of modules required to run the current setup of ownCloud.
 +All of the modules listed should be installed on the base operating system prior to using ownCloud.</p>
 +<div class="section" id="configuration">
 +<h2>Configuration<a class="headerlink" href="#configuration" title="Permalink to this headline">¶</a></h2>
 +<p>By default, the ownCloud Dependencies App is disabled.
 +To enable, navigate to the Apps page and select “ownCloud dependencies info” and enable.</p>
 +<img alt="../../_images/10000000000001C9000000AF9C1CE57F.png" src="../../_images/10000000000001C9000000AF9C1CE57F.png" style="width: 4.7602in; height: 1.8228in;" />
 +</div>
 +<div class="section" id="utilization">
 +<h2>Utilization<a class="headerlink" href="#utilization" title="Permalink to this headline">¶</a></h2>
 +<p>Once this app is enabled, navigate to the Admin page and scroll to “Dependencies status”.
 +This section will show a list of all modules required to execute this ownCloud
 +setup as well as what part of ownCloud uses the given module.</p>
 +<img alt="../../_images/100000000000013C0000017D4FC6CEF5.png" src="../../_images/100000000000013C0000017D4FC6CEF5.png" style="width: 3.2917in; height: 3.9689in;" />
 +<p>Modules in green are required and have been installed.  Modules in red are
 +required yet have not been installed.  It is recommended to install these
 +modules prior to using ownCloud.</p>
 +</div>
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/apps/files_antivirus/index.html
index e20a037,0000000..88c6a22
mode 100644,000000..100644
--- a/core/doc/admin/apps/files_antivirus/index.html
+++ b/core/doc/admin/apps/files_antivirus/index.html
@@@ -1,253 -1,0 +1,256 @@@
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>File Antivirus Engine — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="../../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../../_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="../../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../../_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '../../',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="../../_static/jquery.js"></script>
 +    <script type="text/javascript" src="../../_static/underscore.js"></script>
 +    <script type="text/javascript" src="../../_static/doctools.js"></script>
 +    <script type="text/javascript" src="../../_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../../index.html" />
 +    <link rel="up" title="Apps" href="../index.html" />
 +    <link rel="next" title="Encryption" href="../files_encryption/index.html" />
 +    <link rel="prev" title="Finding Deployment Dependencies" href="../admin_dependencies_chk/index.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="../../contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="../../contents.html">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="../../index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
 +<ul class="current">
 +<li class="toctree-l1"><a class="reference internal" href="../../installation/index.html">Installation</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../../configuration/index.html">Configuration</a></li>
 +<li class="toctree-l1 current"><a class="reference internal" href="../index.html">Apps</a><ul class="current">
 +<li class="toctree-l2"><a class="reference internal" href="../activity/index.html">Activity</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../admin_dependencies_chk/index.html">Finding Deployment Dependencies</a></li>
 +<li class="toctree-l2 current"><a class="current reference internal" href="">File Antivirus Engine</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="#configuration">Configuration</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="../files_encryption/index.html">Encryption</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../files_external/index.html">External storage support</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../files_sharing/index.html">Sharing</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../files_trashbin/index.html">Deleted Files</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../files_versions/index.html">Versions</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../firstrunwizard/index.html">First Run Wizard</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../user_ldap/index.html">LDAP user and group backend</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../viewers/index.html">File Viewers</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l1"><a class="reference internal" href="../../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../sharing_api/index.html">Sharing API</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../../config/index.html">The Configuration File</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../../issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <div class="section" id="file-antivirus-engine">
 +<h1>File Antivirus Engine<a class="headerlink" href="#file-antivirus-engine" title="Permalink to this headline">¶</a></h1>
 +<p>ownCloud integrates with ClamAV, an open source (GPL) antivirus engine, to provide an antivirus solution for files which are uploaded to the ownCloud server.
 +Via this method, ownCloud/ClamAV can detect Trojans, viruses, malware and other malicious threats.
 +Files are scanned for virus upon initial upload to the ownCloud server.</p>
 +<p>The ownCloud antivirus app is supported on ownCloud instances which are installed on a Linux operating system.</p>
 +<p>The antivirus app can run in one of three modes:</p>
 +<ul class="simple">
 +<li>Executable – ClamAV is running on the same server as the ownCloud instance.
 +For executable mode, the ClamAV process is started and stopped with each file upload.</li>
 +<li>Daemon – ClamAV is running on a different server from the ownCloud instance</li>
 +<li>Daemon (Socket) – ClamAV is running on the same server as the ownCloud instance. In this mode, the ClamAV process is running in the background at all times.
 +It is a bit quicker for scanning than executable mode, but requires system administrator skills and root access.</li>
 +</ul>
 +<p>In addition, there are two possible actions which may occur when an infected file is found:</p>
 +<ul class="simple">
 +<li>Only Log – A log entry is created when an infected file is found.</li>
 +<li>Delete File – The infected file is deleted.</li>
 +</ul>
 +<div class="section" id="configuration">
 +<h2>Configuration<a class="headerlink" href="#configuration" title="Permalink to this headline">¶</a></h2>
 +<div class="section" id="enable-the-app">
 +<h3>Enable The app<a class="headerlink" href="#enable-the-app" title="Permalink to this headline">¶</a></h3>
 +<p>To enable the Antivirus App, navigate to the Apps page and select “Antivirus App for Files” and enable.</p>
 +<p><img alt="10000000000001800000009A9494E037_png" src="../../_images/10000000000001800000009A9494E037.png" style="width: 4in; height: 1.6043in;" /></p>
 +</div>
 +<div class="section" id="install-clamav">
 +<h3>Install ClamAV<a class="headerlink" href="#install-clamav" title="Permalink to this headline">¶</a></h3>
 +<p>ClamAV must be installed on the server (either the local for Executable or Daemon Socket mode or a remote server for Daemon mode).</p>
 +<p>To install, use the repository’s installation method to install “clamav”.
 +For example:</p>
 +<div class="highlight-python"><pre>apt-get install clamav</pre>
 +</div>
 +<p>For daemon mode, the ClamAV daemon must also be installed (either on the local machine for Daemon Socket or the remote machine for daemon mode):</p>
 +<div class="highlight-python"><pre>apt-get install clamav-daemon</pre>
 +</div>
 +</div>
 +<div class="section" id="configure-logging">
 +<h3>Configure Logging<a class="headerlink" href="#configure-logging" title="Permalink to this headline">¶</a></h3>
 +<p>Set log level to Everything in the Admin page.</p>
 +<p><img alt="10000000000001AC000000477C76808F_png" src="../../_images/10000000000001AC000000477C76808F.png" style="width: 4.4583in; height: 0.7398in;" /></p>
 +</div>
 +<div class="section" id="executable-mode">
 +<h3>Executable Mode<a class="headerlink" href="#executable-mode" title="Permalink to this headline">¶</a></h3>
 +<p>To run in executable mode, ClamAV must be installed on the local server.
 +From the Admin page, configure Antivirus as follows:</p>
 +<p><img alt="1000000000000165000000D3FF2168AB_png" src="../../_images/1000000000000165000000D3FF2168AB.png" style="width: 3.7189in; height: 2.198in;" /></p>
 +<p>The Stream Length is defined as the ClamAV StreamMaxLengeth Size.
 +The default value, according to the ClamAV web site is 10M which equates to 10485760 bytes as shown in the above example.</p>
 +<p>The Path to clamscan is the path for the executable clamscan file.
 +By default it installs in /usr/bin/clamscan.</p>
 +<p>When files are uploaded, they will be scanned and, if clean, the following logs will appear:</p>
 +<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span><span class="s">"app"</span><span class="p">:</span><span class="s">"files_antivirus"</span><span class="p">,</span><span class="s">"message"</span><span class="p">:</span><span class="s">"Scanning file : \/Lab.txt"</span><span class="p">,</span><span class="s">"level"</span><span class="p">:</span><span class="mi">0</span><span class="p">,</span><span clas [...]
 +<span class="p">{</span><span class="s">"app"</span><span class="p">:</span><span class="s">"files_antivirus"</span><span class="p">,</span><span class="s">"message"</span><span class="p">:</span><span class="s">"Exec scan: \/Lab.txt"</span><span class="p">,</span><span class="s">"level"</span><span class="p">:</span><span class="mi">0</span><span class="p">,</span><span class="s">"time"</span><span class="p">:</span><span clas [...]
 +<span class="p">{</span><span class="s">"app"</span><span class="p">:</span><span class="s">"files_antivirus"</span><span class="p">,</span><span class="s">"message"</span><span class="p">:</span><span class="s">"Result CLEAN!"</span><span class="p">,</span><span class="s">"level"</span><span class="p">:</span><span class="mi">0</span><span class="p">,</span><span class="s">"time"</span><span class="p">:</span><span class="s">& [...]
 +</pre></div>
 +</div>
 +</div>
 +<div class="section" id="daemon-mode">
 +<h3>Daemon Mode<a class="headerlink" href="#daemon-mode" title="Permalink to this headline">¶</a></h3>
 +<p>When running in Daemon Mode, install ClamAV and clamAV-Daemon on a remote server.</p>
 +<p>The port, upon which ClamAV listens must be configured.
 +To do this, add the following line in <tt class="docutils literal"><span class="pre">/etc/clamav/clamd.conf</span></tt>:</p>
 +<div class="highlight-python"><pre>TCPSocket 3310</pre>
 +</div>
 +<p>Then restart the Clamd service:</p>
 +<div class="highlight-python"><pre>/etc/init.d/clamav-daemon restart</pre>
 +</div>
 +<p>Back on the ownCloud server, navigate to the Admin page and configure the Antivirus Configuration as follows:</p>
 +<p><img alt="1000000000000194000000FAD39BC0D8_png" src="../../_images/1000000000000194000000FAD39BC0D8.png" style="width: 4.2083in; height: 2.6043in;" /></p>
 +<p>Where the host is the IP of the server running the ClamAV Daemon and the Port is what was configured in the above step.</p>
 +<p>Upon upload of files to the ownCloud server, the following logs will appear indicating the files are clean:</p>
 +<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span><span class="s">"app"</span><span class="p">:</span><span class="s">"files_antivirus"</span><span class="p">,</span><span class="s">"message"</span><span class="p">:</span><span class="s">"Scanning file : \/Lab.txt"</span><span class="p">,</span><span class="s">"level"</span><span class="p">:</span><span class="mi">0</span><span class="p">,</span><span clas [...]
 +<span class="p">{</span><span class="s">"app"</span><span class="p">:</span><span class="s">"files_antivirus"</span><span class="p">,</span><span class="s">"message"</span><span class="p">:</span><span class="s">"Response :: stream: OK</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span><span class="s">"level"</span><span class="p">:</span><span class="mi">0</span><span class="p">,</span><span class="s">" [...]
 +</pre></div>
 +</div>
 +</div>
 +<div class="section" id="daemon-socket-mode">
 +<h3>Daemon Socket mode<a class="headerlink" href="#daemon-socket-mode" title="Permalink to this headline">¶</a></h3>
 +<p>To run in Daemon socket mode, install clamav and clamav-daemon on the ownCloud server.</p>
 +<p>Configure the Admin page as such:</p>
 +<p><img alt="1000000000000160000000DBB2FB0223_png" src="../../_images/1000000000000160000000DBB2FB0223.png" style="width: 3.6665in; height: 2.2811in;" /></p>
 +<p>Where Socket is the location of the Clamd executable.</p>
 +<p>Upon upload of a clean file to the ownCloud server, the following logs will appear:</p>
 +<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span><span class="s">"app"</span><span class="p">:</span><span class="s">"files_antivirus"</span><span class="p">,</span><span class="s">"message"</span><span class="p">:</span><span class="s">"Scanning file : \/Lab.txt"</span><span class="p">,</span><span class="s">"level"</span><span class="p">:</span><span class="mi">0</span><span class="p">,</span><span clas [...]
 +<span class="p">{</span><span class="s">"app"</span><span class="p">:</span><span class="s">"files_antivirus"</span><span class="p">,</span><span class="s">"message"</span><span class="p">:</span><span class="s">"Response :: stream: OK</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span><span class="s">"level"</span><span class="p">:</span><span class="mi">0</span><span class="p">,</span><span class="s">" [...]
 +</pre></div>
 +</div>
 +</div>
 +</div>
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/apps/files_encryption/index.html
index daf3929,0000000..1a368f2
mode 100644,000000..100644
--- a/core/doc/admin/apps/files_encryption/index.html
+++ b/core/doc/admin/apps/files_encryption/index.html
@@@ -1,291 -1,0 +1,294 @@@
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>Encryption — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="../../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../../_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="../../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../../_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '../../',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="../../_static/jquery.js"></script>
 +    <script type="text/javascript" src="../../_static/underscore.js"></script>
 +    <script type="text/javascript" src="../../_static/doctools.js"></script>
 +    <script type="text/javascript" src="../../_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../../index.html" />
 +    <link rel="up" title="Apps" href="../index.html" />
 +    <link rel="next" title="External storage support" href="../files_external/index.html" />
 +    <link rel="prev" title="File Antivirus Engine" href="../files_antivirus/index.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="../../contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="../../contents.html">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="../../index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
 +<ul class="current">
 +<li class="toctree-l1"><a class="reference internal" href="../../installation/index.html">Installation</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../../configuration/index.html">Configuration</a></li>
 +<li class="toctree-l1 current"><a class="reference internal" href="../index.html">Apps</a><ul class="current">
 +<li class="toctree-l2"><a class="reference internal" href="../activity/index.html">Activity</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../admin_dependencies_chk/index.html">Finding Deployment Dependencies</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../files_antivirus/index.html">File Antivirus Engine</a></li>
 +<li class="toctree-l2 current"><a class="current reference internal" href="">Encryption</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="#what-gets-encrypted">What gets encrypted?</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="#decrypting-the-data">Decrypting the data</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="#configuration">Configuration</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="#file-systems">File Systems</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="../files_external/index.html">External storage support</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../files_sharing/index.html">Sharing</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../files_trashbin/index.html">Deleted Files</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../files_versions/index.html">Versions</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../firstrunwizard/index.html">First Run Wizard</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../user_ldap/index.html">LDAP user and group backend</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../viewers/index.html">File Viewers</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l1"><a class="reference internal" href="../../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../sharing_api/index.html">Sharing API</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../../config/index.html">The Configuration File</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../../issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <div class="section" id="encryption">
 +<h1>Encryption<a class="headerlink" href="#encryption" title="Permalink to this headline">¶</a></h1>
 +<p>ownCloud contains an encryption app which, when enabled, encrypts all files stored in ownCloud.
 +The encryption is done automatically once the admin enables the app.
 +All encryption and decryption occur on the ownCloud server, which allows the
 +user to continue to use other apps to view and edit the data.</p>
 +<p>The user’s password is used as the key to decrypt their data.
 +This means that if the user loses their login password, data will be lost.
 +To protect against password loss, the recovery key may be used as described in a later section.</p>
 +<div class="section" id="what-gets-encrypted">
 +<h2>What gets encrypted?<a class="headerlink" href="#what-gets-encrypted" title="Permalink to this headline">¶</a></h2>
 +<p>All files stored in ownCloud will be encrypted with the following exceptions:</p>
 +<ul class="simple">
 +<li>Old versions (versions created prior to enabling the encryption app)</li>
 +<li>Old files in the trash bin (files deleted prior to enabling the encryption app)</li>
 +<li>Existing files on external storage.
 +Only new files placed on the external storage mount after encryption was enabled are encrypted.</li>
 +<li>Image thumbnails from the gallery app</li>
 +<li>Search index form the full text search app.</li>
 +</ul>
 +</div>
 +<div class="section" id="decrypting-the-data">
 +<h2>Decrypting the data<a class="headerlink" href="#decrypting-the-data" title="Permalink to this headline">¶</a></h2>
 +<p>If the encryption app is disable, users will get the following message alerting
 +them how to decrypt their files.</p>
 +<img alt="../../_images/100000000000023B000000125381F51B.png" src="../../_images/100000000000023B000000125381F51B.png" style="width: 5.948in; height: 0.1874in;" />
 +<p>Navigating to the Personal settings page, the user can enter their password and
 +decrypt all files.</p>
 +<img alt="../../_images/100000000000018B000000A090F31164.png" src="../../_images/100000000000018B000000A090F31164.png" style="width: 4.1146in; height: 1.6665in;" />
 +</div>
 +<div class="section" id="configuration">
 +<h2>Configuration<a class="headerlink" href="#configuration" title="Permalink to this headline">¶</a></h2>
 +<p>To enable the encryption app, navigate to the Apps page and select Encryption, then enable.</p>
 +<img alt="../../_images/10000000000001A3000000AAFE82893A.png" src="../../_images/10000000000001A3000000AAFE82893A.png" />
 +<p>Once the app is enabled, the following message will appear for all users
 +currently logged into the web browser as they navigate to a new page within the
 +ownCloud web browser</p>
 +<img alt="../../_images/10000000000001BF00000012349EAE2F.png" src="../../_images/10000000000001BF00000012349EAE2F.png" />
 +<p>It is necessary to logout of ownCloud and re-login to initialize the encryption keys.</p>
 +<div class="section" id="recovery-key">
 +<h3>Recovery Key<a class="headerlink" href="#recovery-key" title="Permalink to this headline">¶</a></h3>
 +<p>Enabling the recovery key globally is done by the admin.
 +Each user then has the option as to whether they wish to do so for their own account.
 +If enabled, the admin will be able to reset the user’s encryption password
 +using a predefined recovery password.  This allows for the recovery of a user’s
 +files in the event of a password loss.  If recovery key is not enabled, there
 +is no way to restore files if the login password is lost.</p>
 +<div class="section" id="admin-level">
 +<h4>Admin level<a class="headerlink" href="#admin-level" title="Permalink to this headline">¶</a></h4>
 +<p>To enable the recovery key, the Admin must first enable this feature in the Admin page.</p>
 +<img alt="../../_images/100000000000018E000000C4BA62B2A3.png" src="../../_images/100000000000018E000000C4BA62B2A3.png" />
 +<p>Once enabled, the Admin may change the recovery key password at any time.</p>
 +<img alt="../../_images/1000000000000193000001AE9AB8B0A2.png" src="../../_images/1000000000000193000001AE9AB8B0A2.png" />
 +</div>
 +<div class="section" id="user-level">
 +<h4>User level<a class="headerlink" href="#user-level" title="Permalink to this headline">¶</a></h4>
 +<p>The user can then navigate to the Personal page and enable password recovery.</p>
 +<img alt="../../_images/1000000000000227000000935D9B1EF6.png" src="../../_images/1000000000000227000000935D9B1EF6.png" />
 +</div>
 +<div class="section" id="recovery">
 +<h4>Recovery<a class="headerlink" href="#recovery" title="Permalink to this headline">¶</a></h4>
 +<p>In order for the admin to recover the user’s files in the event of a lost
 +password, the admin should navigate to the “Users” tab and enter the Recovery
 +Key Password into the “Admin Recovery Password” field at the top of the page.</p>
 +<img alt="../../_images/10000000000003730000002B6865E951.png" src="../../_images/10000000000003730000002B6865E951.png" />
 +<p>This will allow the admin to generate a new encryption password for the user.</p>
 +<ul class="simple">
 +<li>For local user management, this will generate both a new log-in password as well
 +as a new encryption password for the data.</li>
 +<li>If LDAP authentication is in use, the admin would need to set the new log-in password
 +in the LDAP server, and then enter the same password in the user management page for
 +the encryption key. It is important that both the password in the LDAP server and the
 +password entered in the user management page are identical.</li>
 +</ul>
 +</div>
 +</div>
 +</div>
 +<div class="section" id="file-systems">
 +<h2>File Systems<a class="headerlink" href="#file-systems" title="Permalink to this headline">¶</a></h2>
 +<p>Once enabled, all files within ownCloud are encrypted, with the exceptions mentioned above.
 +This includes files in local storage, as well as files contained within external storage mounts.</p>
 +<p>The encryption app creates several key files/folders when enabled.
 +<tt class="docutils literal"><span class="pre">~/data/public-keys</span></tt> contains the public keys for all users, and
 +<tt class="docutils literal"><span class="pre">~/data/owncloud_private_keys</span></tt> contains system wide private keys utilized for
 +public link shares as well as the recovery key.</p>
 +<div class="highlight-console"><div class="highlight"><pre><span class="gp">root at server:/var/www/owncloud/data#</span> ls
 +<span class="go">files_encryption/  mount.json  owncloud.log           public-keys/ yogi/</span>
 +<span class="go">index.html         oc6admin/   owncloud_private_key/  user1/</span>
 +</pre></div>
 +</div>
 +<p>The encryption app stores key information in the <tt class="docutils literal"><span class="pre">~/data/<user>/files_encryption</span></tt> directory.</p>
 +<div class="highlight-console"><div class="highlight"><pre><span class="gp">root at server:/var/www/owncloud/data/user1/encryption#</span> ls
 +<span class="go">keyfiles/ user1.private.key share-keys/</span>
 +</pre></div>
 +</div>
 +<p>As mentioned previously, the private key is generated from the user’s password.</p>
 +<p>Each file that the user owns will have a corresponding keyfile maintained in the keyfiles directory.</p>
 +<div class="highlight-console"><div class="highlight"><pre><span class="gp">root at server:/var/www/owncloud/data/user1/files_encryption/keyfiles#</span> ls
 +<span class="go">documents/ ownCloud undelete.docx.key photos/</span>
 +<span class="go">music/     ownCloudUserManual.pdf.key test encryption.txt.key</span>
 +</pre></div>
 +</div>
 +<p>In addition a share key will be generated for each file in the event that there
 +is an external storage mount by the admin for multiple users or groups.</p>
 +<div class="highlight-console"><div class="highlight"><pre><span class="gp">root at server:/var/www/owncloud/data/user1/files_encryption/share-keys#</span> ls
 +<span class="go">documents/</span>
 +<span class="go">music/</span>
 +<span class="go">ownCloud undelete.docx.recovery_5dcce10a.shareKey</span>
 +<span class="go">ownCloud undelete.docx.user1.shareKey</span>
 +<span class="go">ownCloudUserManual.pdf.recovery_5dcce10a.shareKey</span>
 +<span class="go">ownCloudUserManual.pdf.user1.shareKey</span>
 +<span class="go">photos/</span>
 +<span class="go">test encryption.txt.recovery_5dcce10a.shareKey</span>
 +<span class="go">test encryption.txt.user1.shareKey</span>
 +<span class="go">...</span>
 +</pre></div>
 +</div>
 +<p>When viewing a file directly on the ownCloud data directory, it will show up as encrypted.</p>
 +<div class="highlight-console"><div class="highlight"><pre><span class="gp">root at server:/var/www/owncloud/data/user1/files#</span> more <span class="nb">test</span><span class="se">\ </span>encryption.txt
 +<span class="go">2JnmDdDh//8FVcDhLrnD1WH0JjhrzKpFKV6V61pAfUCu9IJX00iv007Yw3Tf/QBbtJFpQFxx</span>
 +</pre></div>
 +</div>
 +<p>However, viewing the same file via the browser, the actual contents of the file are displayed.</p>
 +<img alt="../../_images/edit_encrypted_file.png" src="../../_images/edit_encrypted_file.png" />
 +</div>
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/apps/files_external/index.html
index e2882d9,0000000..5e1aed9
mode 100644,000000..100644
--- a/core/doc/admin/apps/files_external/index.html
+++ b/core/doc/admin/apps/files_external/index.html
@@@ -1,491 -1,0 +1,494 @@@
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>External storage support — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="../../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../../_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="../../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../../_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '../../',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="../../_static/jquery.js"></script>
 +    <script type="text/javascript" src="../../_static/underscore.js"></script>
 +    <script type="text/javascript" src="../../_static/doctools.js"></script>
 +    <script type="text/javascript" src="../../_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../../index.html" />
 +    <link rel="up" title="Apps" href="../index.html" />
 +    <link rel="next" title="Sharing" href="../files_sharing/index.html" />
 +    <link rel="prev" title="Encryption" href="../files_encryption/index.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="../../contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="../../contents.html">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="../../index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
 +<ul class="current">
 +<li class="toctree-l1"><a class="reference internal" href="../../installation/index.html">Installation</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../../configuration/index.html">Configuration</a></li>
 +<li class="toctree-l1 current"><a class="reference internal" href="../index.html">Apps</a><ul class="current">
 +<li class="toctree-l2"><a class="reference internal" href="../activity/index.html">Activity</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../admin_dependencies_chk/index.html">Finding Deployment Dependencies</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../files_antivirus/index.html">File Antivirus Engine</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../files_encryption/index.html">Encryption</a></li>
 +<li class="toctree-l2 current"><a class="current reference internal" href="">External storage support</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="#supported-mounts">Supported mounts</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="#configuration">Configuration</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="../files_sharing/index.html">Sharing</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../files_trashbin/index.html">Deleted Files</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../files_versions/index.html">Versions</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../firstrunwizard/index.html">First Run Wizard</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../user_ldap/index.html">LDAP user and group backend</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../viewers/index.html">File Viewers</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l1"><a class="reference internal" href="../../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../sharing_api/index.html">Sharing API</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../../config/index.html">The Configuration File</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../../issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <div class="section" id="external-storage-support">
 +<h1>External storage support<a class="headerlink" href="#external-storage-support" title="Permalink to this headline">¶</a></h1>
 +<p>ownCloud provides the ability to mount an external storage device.
 +The external storage devices serves as a secondary storage device within ownCloud.</p>
 +<p>The ownCloud Admin has the ability to create such a mount.
 +In addition, the ownCloud Admin may decide to provide the end user the ability to create the mount.
 +The mounts may be created on a per-user, per group, or all user basis.</p>
 +<div class="section" id="supported-mounts">
 +<h2>Supported mounts<a class="headerlink" href="#supported-mounts" title="Permalink to this headline">¶</a></h2>
 +<p>The following lists the supported storage types.</p>
 +<ul class="simple">
 +<li>Local</li>
 +<li>Amazon S3</li>
 +<li>Dropbox</li>
 +<li>FTP</li>
 +<li>Google Drive</li>
 +<li>OpenStack Object Storage</li>
 +<li>SMB/CIFS</li>
 +<li>ownCloud/WebDAV</li>
 +<li>SFTP</li>
 +<li>iRODS</li>
 +</ul>
 +</div>
 +<div class="section" id="configuration">
 +<h2>Configuration<a class="headerlink" href="#configuration" title="Permalink to this headline">¶</a></h2>
 +<div class="section" id="enable-the-app">
 +<h3>Enable the app<a class="headerlink" href="#enable-the-app" title="Permalink to this headline">¶</a></h3>
 +<p>From the <tt class="docutils literal"><span class="pre">APPs</span></tt> Page within ownCloud, select <tt class="docutils literal"><span class="pre">External</span> <span class="pre">Storage</span> <span class="pre">Support</span></tt> and enable.</p>
 +<p><img alt="10000000000001980000009271BE0D26_png" src="../../_images/10000000000001980000009271BE0D26.png" style="width: 4.25in; height: 1.5201in;" /></p>
 +</div>
 +<div class="section" id="configure-mounts">
 +<h3>Configure mounts<a class="headerlink" href="#configure-mounts" title="Permalink to this headline">¶</a></h3>
 +<p>As stated previously, the Admin has the ability to configure these mounts, as
 +well as decide whether an end user can configure mounts for themselves.  For
 +the Admin, the configuration is performed in the <tt class="docutils literal"><span class="pre">Admin</span></tt> page.  For end
 +users, the configuration is performed in the <tt class="docutils literal"><span class="pre">Personal</span></tt> Page.  This document
 +will discuss how the Admin configures the mounts, however, the configuration is
 +the same for the end user.</p>
 +<p>On the <tt class="docutils literal"><span class="pre">Admin</span></tt> page, scroll to External Storage:</p>
 +<p><img alt="1000000000000631000000E19D116AA0_png" src="../../_images/1000000000000631000000E19D116AA0.png" style="width: 6.5in; height: 0.9228in;" /></p>
 +<div class="section" id="enable-users-to-mount-their-own-devices">
 +<h4>Enable users to mount their own devices<a class="headerlink" href="#enable-users-to-mount-their-own-devices" title="Permalink to this headline">¶</a></h4>
 +<p>In order to allow end users to mount their own devices, select the radio button next to
 +Enable User External Storage.</p>
 +</div>
 +<div class="section" id="local-storage">
 +<h4>Local Storage<a class="headerlink" href="#local-storage" title="Permalink to this headline">¶</a></h4>
 +<p>This is used to mount storage that is outside ownCloud’s data directory</p>
 +<p><img alt="10000000000006060000006A0106CA0C_png" src="../../_images/10000000000006060000006A0106CA0C.png" style="width: 6.5in; height: 0.4465in;" /></p>
 +<ul class="simple">
 +<li>Location – The directory to mount</li>
 +<li>Applicable – A list users of who can see this mount</li>
 +</ul>
 +<p><img alt="10000000000003DF00000071A41D8A1F_png" src="../../_images/10000000000003DF00000071A41D8A1F.png" style="width: 6.5in; height: 0.7409in;" /></p>
 +<p>Note: When configured correctly, a <em>Green Light</em> will appear next to the Folder Name.
 +If misconfigured, a <em>Red Light</em> will appear.</p>
 +<p><img alt="10000000000004770000008AAF3CFFDB_png" src="../../_images/10000000000004770000008AAF3CFFDB.png" style="width: 6.5in; height: 0.7846in;" /></p>
 +</div>
 +<div class="section" id="amazon-s3">
 +<h4>Amazon S3<a class="headerlink" href="#amazon-s3" title="Permalink to this headline">¶</a></h4>
 +<p>This is used to mount to an S3 server</p>
 +<p><img alt="100000000000061D0000007047877972_png" src="../../_images/100000000000061D0000007047877972.png" style="width: 6.5in; height: 0.4654in;" /></p>
 +<ul class="simple">
 +<li>Access Key – The access key provided by the S3 storage provider</li>
 +<li>Secret Key – The secret key provided by the S3 storage provider</li>
 +<li>Bucket – The bucket created within the S3 storage server</li>
 +<li>Hostname (optional) – The host of the s3 storage server</li>
 +<li>Port (optional) – The port to communicate to the host on</li>
 +<li>Region (optional) – The region where the storage exists</li>
 +<li>Applicable – A list of users who can see this mount</li>
 +</ul>
 +<p><img alt="10000000000005BB0000007C1DF71FA7_png" src="../../_images/10000000000005BB0000007C1DF71FA7.png" style="width: 6.5in; height: 0.5492in;" /></p>
 +<div class="admonition note">
 +<p class="first admonition-title">Note</p>
 +<p class="last">When configured correctly, a Green Light will appear next to the Folder Name.
 +If misconfigured, a Red Light will appear.</p>
 +</div>
 +<p><img alt="100000000000063F00000090AAE1FA4A_png" src="../../_images/100000000000063F00000090AAE1FA4A.png" style="width: 6.5in; height: 0.5846in;" /></p>
 +</div>
 +<div class="section" id="dropbox">
 +<h4>Dropbox<a class="headerlink" href="#dropbox" title="Permalink to this headline">¶</a></h4>
 +<p>Mounts a dropbox in the Dropbox cloud into the virtual file system.</p>
 +<div class="section" id="configure-dropbox">
 +<h5>Configure DropBox<a class="headerlink" href="#configure-dropbox" title="Permalink to this headline">¶</a></h5>
 +<p>Log onto the <a class="reference external" href="http://www.dropbox.com/developers">Dropbox Developers page</a>:</p>
 +<p>Select App Console:</p>
 +<p><img alt="10000000000000A800000073F49785A6_png" src="../../_images/10000000000000A800000073F49785A6.png" style="width: 1.75in; height: 1.198in;" /></p>
 +<p>This will ask you to accept terms and conditions.</p>
 +<p>Select Dropbox API and configure down the page as follows:</p>
 +<p><img alt="1000000000000372000002AF943ADDA0_png" src="../../_images/1000000000000372000002AF943ADDA0.png" style="width: 6.5in; height: 5.0634in;" /></p>
 +<p>The name can be any unique name desired.</p>
 +<p>Select Create App</p>
 +<p><img alt="10000000000000950000004412998BE7_png" src="../../_images/10000000000000950000004412998BE7.png" style="width: 1.552in; height: 0.7083in;" /></p>
 +<p>Enter the OAuth redirect URI as follows:</p>
 +<div class="highlight-python"><pre>http://<ownCloud instance>/index.php/settings/personal
 +http://<ownCloud instance>/index.php/settings/admin</pre>
 +</div>
 +<p><img alt="10000000000003A6000002A9C7A660BE_png" src="../../_images/10000000000003A6000002A9C7A660BE.png" style="width: 6.5in; height: 4.7398in;" /></p>
 +<p>Take note of the App Key and App Secret and enter into ownCloud.</p>
 +</div>
 +<div class="section" id="owncloud-configuration">
 +<h5>ownCloud Configuration<a class="headerlink" href="#owncloud-configuration" title="Permalink to this headline">¶</a></h5>
 +<p><img alt="100000000000060300000065DF96536B_png" src="../../_images/100000000000060300000065DF96536B.png" style="width: 6.5in; height: 0.4264in;" /></p>
 +<ul class="simple">
 +<li>App key – The app key to login to your Dropbox</li>
 +<li>App secret – The app secret to login to your Dropbox</li>
 +<li>Applicable – A list users of who can see this mount</li>
 +</ul>
 +<p><img alt="10000000000005EC00000073E678DFEC_png" src="../../_images/10000000000005EC00000073E678DFEC.png" style="width: 6.5in; height: 0.4929in;" /></p>
 +<p>Select “Grant Access” and the following appears</p>
 +<p><img alt="10000000000002950000021E245F6883_png" src="../../_images/10000000000002950000021E245F6883.png" style="width: 6.5in; height: 5.3299in;" /></p>
 +<p>Note if you are not logged into Dropbox, you will first be prompted to login.
 +Select Allow.</p>
 +<p><img alt="10000000000005E6000000676902E040_png" src="../../_images/10000000000005E6000000676902E040.png" style="width: 6.5in; height: 0.4429in;" /></p>
 +<div class="admonition note">
 +<p class="first admonition-title">Note</p>
 +<p class="last">When configured correctly, a Green Light will appear next to the Folder Name.
 +If misconfigured, a Red Light will appear.</p>
 +</div>
 +<p><img alt="100000000000061A0000006FC014C3A4_png" src="../../_images/100000000000061A0000006FC014C3A4.png" style="width: 6.5in; height: 0.461in;" /></p>
 +</div>
 +</div>
 +<div class="section" id="ftp">
 +<h4>FTP<a class="headerlink" href="#ftp" title="Permalink to this headline">¶</a></h4>
 +<p>Mounts a folder on a remote FTP or FTPS server</p>
 +<p><img alt="100000000000061E0000006BCF9ECC0B_png" src="../../_images/100000000000061E0000006BCF9ECC0B.png" style="width: 6.5in; height: 0.4437in;" /></p>
 +<ul class="simple">
 +<li>URL – The hostname of the FTP/FTPS server</li>
 +<li>Username – The username to login to the FTP/FTPS server</li>
 +<li>Password – The password to login to the FTP/FTPS esrver</li>
 +<li>Root – The folder inside the FTP/FTPS server to mount (optional – defaults to ‘/’)</li>
 +<li>Secure <tt class="docutils literal"><span class="pre">ftps://</span></tt> – Whether to use ftps:// to connect to the FTP server instead of <tt class="docutils literal"><span class="pre">ftp://</span></tt></li>
 +<li>Applicable – A list users of who can see this mount</li>
 +</ul>
 +<p><img alt="10000000000005AF00000074604B1A67_png" src="../../_images/10000000000005AF00000074604B1A67.png" style="width: 6.5in; height: 0.5181in;" /></p>
 +<div class="admonition note">
 +<p class="first admonition-title">Note</p>
 +<p class="last">When configured correctly, a Green Light will appear next to the
 +Folder Name.  If misconfigured, a Red Light will appear.</p>
 +</div>
 +<p><img alt="10000000000005D50000009458C5EE48_png" src="../../_images/10000000000005D50000009458C5EE48.png" style="width: 6.5in; height: 0.6437in;" /></p>
 +</div>
 +<div class="section" id="googledrive">
 +<h4>GoogleDrive<a class="headerlink" href="#googledrive" title="Permalink to this headline">¶</a></h4>
 +<p>Mounts a share in the Google cloud.</p>
 +<div class="section" id="configure-googledrive">
 +<h5>Configure GoogleDrive<a class="headerlink" href="#configure-googledrive" title="Permalink to this headline">¶</a></h5>
 +<p>All applications that access a Google API must be registered through the “Google Cloud Console”.
 +This can be accessed at the following URL:</p>
 +<p><a class="reference external" href="https://cloud.google.com">https://cloud.google.com</a></p>
 +<p>Once logged into Google, create a project by selecting
 +Create Project</p>
 +<p><img alt="1000000000000247000000A77440E4D3_png" src="../../_images/1000000000000247000000A77440E4D3.png" style="width: 6.0728in; height: 1.7398in;" /></p>
 +<p>Enter a Project name and either keep or enter a new Project ID
 +<img alt="100000000000027B0000011D10F70F88_png" src="../../_images/100000000000027B0000011D10F70F88.png" style="width: 6.5in; height: 2.9173in;" /></p>
 +<p>Select the project and choose the APIs & auth menu entry
 +<img alt="10000000000000B600000120706C3C75_png" src="../../_images/10000000000000B600000120706C3C75.png" style="width: 1.8957in; height: 3in;" /></p>
 +<p>Enable <tt class="docutils literal"><span class="pre">Drive</span> <span class="pre">API</span></tt> and <tt class="docutils literal"><span class="pre">Drive</span> <span class="pre">SDK</span></tt> and then select the</p>
 +<p><img alt="100000000000003800000018D49F1CE7_png" src="../../_images/100000000000003800000018D49F1CE7.png" style="width: 0.5835in; height: 0.25in;" /></p>
 +<p>next to either <tt class="docutils literal"><span class="pre">Drive</span> <span class="pre">API</span></tt> or <tt class="docutils literal"><span class="pre">Drive</span> <span class="pre">SDK</span></tt></p>
 +<p><img alt="10000000000004100000005657010336_png" src="../../_images/10000000000004100000005657010336.png" style="width: 6.5in; height: 0.5374in;" /></p>
 +<p>Select <tt class="docutils literal"><span class="pre">API</span> <span class="pre">Access</span></tt> on the menu</p>
 +<p><img alt="10000000000000CD000000ECA8DE7780_png" src="../../_images/10000000000000CD000000ECA8DE7780.png" style="width: 2.1346in; height: 2.4583in;" /></p>
 +<p>Select <tt class="docutils literal"><span class="pre">REGISTER</span> <span class="pre">APP</span></tt></p>
 +<p><img alt="10000000000001FD000000DF8D2D7546_png" src="../../_images/10000000000001FD000000DF8D2D7546.png" style="width: 5.302in; height: 2.3228in;" /></p>
 +<p>Enter a name and select <tt class="docutils literal"><span class="pre">Web</span> <span class="pre">Application</span></tt></p>
 +<p><img alt="10000000000002840000016729388B7F_png" src="../../_images/10000000000002840000016729388B7F.png" style="width: 6.5in; height: 3.6228in;" /></p>
 +<p>Expand <tt class="docutils literal"><span class="pre">OAuth</span> <span class="pre">2.0</span> <span class="pre">Client</span> <span class="pre">ID</span></tt>
 +Enter the following in the <tt class="docutils literal"><span class="pre">REDIRECT</span> <span class="pre">URI</span></tt> field:</p>
 +<div class="highlight-python"><pre>http://<ownCloud instance>/index.php/settings/personal
 +http://<ownCloud instance>/index.php/settings/admin</pre>
 +</div>
 +<div class="admonition note">
 +<p class="first admonition-title">Note</p>
 +<p class="last">The <tt class="docutils literal"><span class="pre"><ownCloud</span> <span class="pre">instance></span></tt> must be a Fully Qualified Domain Name.  It cannot be an IP address!</p>
 +</div>
 +<p>Select <tt class="docutils literal"><span class="pre">Generate</span></tt></p>
 +<p><img alt="10000000000003B30000021B5EE5D338_png" src="../../_images/10000000000003B30000021B5EE5D338.png" style="width: 6.5in; height: 3.6992in;" /></p>
 +<p>Verify that the required email addresses are in the Permissions tab</p>
 +<p><img alt="10000000000003A60000011E274A1A28_png" src="../../_images/10000000000003A60000011E274A1A28.png" style="width: 6.5in; height: 1.9902in;" /></p>
 +</div>
 +<div class="section" id="configure-owncloud">
 +<h5>Configure ownCloud<a class="headerlink" href="#configure-owncloud" title="Permalink to this headline">¶</a></h5>
 +<p>Prior to configuring the mount, an E-mail address needs to be configured in the <tt class="docutils literal"><span class="pre">Personal</span></tt> tab</p>
 +<p><img alt="10000000000001880000007EA4444400_png" src="../../_images/10000000000001880000007EA4444400.png" style="width: 4.0835in; height: 1.3126in;" /></p>
 +<p><img alt="10000000000006000000005EDA7B96BE_png" src="../../_images/10000000000006000000005EDA7B96BE.png" style="width: 6.5in; height: 0.398in;" /></p>
 +<ul class="simple">
 +<li>Client ID – The client id to login to the Google Drive from <tt class="docutils literal"><span class="pre">OAuth</span> <span class="pre">2.0</span> <span class="pre">Client</span> <span class="pre">ID</span></tt> above</li>
 +<li>Client secret – The client secret to login to the Google Drive from <tt class="docutils literal"><span class="pre">OAuth</span> <span class="pre">2.0</span> <span class="pre">Client</span> <span class="pre">ID</span></tt> above</li>
 +<li>Applicable – A list users of who can see this mount</li>
 +</ul>
 +<p>Once the required fields are filled in, a <tt class="docutils literal"><span class="pre">Grant</span> <span class="pre">access</span></tt> button appears.  Select this button.</p>
 +<p><img alt="10000000000005F70000007E43DB8026_png" src="../../_images/10000000000005F70000007E43DB8026.png" style="width: 6.5in; height: 0.5362in;" /></p>
 +<p>The following screen appears. Select <tt class="docutils literal"><span class="pre">Accept</span></tt></p>
 +<p><img alt="10000000000001D30000014DC251C948_png" src="../../_images/10000000000001D30000014DC251C948.png" style="width: 4.8646in; height: 3.4689in;" /></p>
 +<p><img alt="10000000000004C0000000795BB2C146_png" src="../../_images/10000000000004C0000000795BB2C146.png" style="width: 6.5in; height: 0.6465in;" /></p>
 +<p><img alt="1000000000000552000000BF22E90239_png" src="../../_images/1000000000000552000000BF22E90239.png" style="width: 6.5in; height: 0.911in;" /></p>
 +<div class="admonition note">
 +<p class="first admonition-title">Note</p>
 +<p class="last">When configured correctly, a Green Light will appear next to the
 +Folder Name.  If misconfigured, a Red Light will appear.</p>
 +</div>
 +</div>
 +</div>
 +<div class="section" id="openstack-object-storage">
 +<h4>OpenStack Object Storage<a class="headerlink" href="#openstack-object-storage" title="Permalink to this headline">¶</a></h4>
 +<p>Mounts a container on an OpenStack Object Storage server.</p>
 +<p><img alt="100000000000053A00000067708C8F53_png" src="../../_images/100000000000053A00000067708C8F53.png" style="width: 6.5in; height: 0.5008in;" /></p>
 +<p><img alt="10000000000002170000004A27056037_png" src="../../_images/10000000000002170000004A27056037.png" style="width: 5.5728in; height: 0.7701in;" /></p>
 +<ul class="simple">
 +<li>Username</li>
 +<li>Bucket</li>
 +<li>Region</li>
 +<li>API Key</li>
 +<li>Tenantname</li>
 +<li>Password</li>
 +<li>Service Name</li>
 +<li>URL of identity Endpoint</li>
 +<li>Timeout of HTTP request</li>
 +<li>Applicable – A list users of who can see this mount</li>
 +</ul>
 +<div class="admonition note">
 +<p class="first admonition-title">Note</p>
 +<p class="last">When configured correctly, a Green Light will appear next to the
 +Folder Name.  If misconfigured, a Red Light will appear.</p>
 +</div>
 +</div>
 +<div class="section" id="smb-cifs">
 +<h4>SMB/CIFS<a class="headerlink" href="#smb-cifs" title="Permalink to this headline">¶</a></h4>
 +<p>Mounts a folder on a remote Samba server, NAS appliance, or Windows machine.</p>
 +<p><img alt="10000000000005FA0000005CE8491B77_png" src="../../_images/10000000000005FA0000005CE8491B77.png" style="width: 6.5in; height: 0.3909in;" /></p>
 +<ul class="simple">
 +<li>URL – The host name of the Samba server.</li>
 +<li>Username – The user name used to login to the Samba server.</li>
 +<li>Password – The password to login to the Samba server.</li>
 +<li>Share – The share on the Samba server to mount.</li>
 +<li>Root – The folder inside the Samba share to mount (optional, defaults to ‘/’)</li>
 +<li>Applicable – A list users of who can see this mount</li>
 +</ul>
 +<p><img alt="10000000000005C30000006CAFFAAD61_png" src="../../_images/10000000000005C30000006CAFFAAD61.png" style="width: 6.5in; height: 0.4756in;" /></p>
 +<div class="admonition note">
 +<p class="first admonition-title">Note</p>
 +<p class="last">When configured correctly, a Green Light will appear next to the
 +Folder Name.  If misconfigured, a Red Light will appear.</p>
 +</div>
 +<div class="admonition note">
 +<p class="first admonition-title">Note</p>
 +<p class="last">The SMB backend requires <tt class="docutils literal"><span class="pre">smbclient</span></tt> to be installed on the server.</p>
 +</div>
 +<p><img alt="10000000000005D00000003B29340A7A_png" src="../../_images/10000000000005D00000003B29340A7A.png" style="width: 6.5in; height: 0.2575in;" /></p>
 +</div>
 +<div class="section" id="owncloud-webdav">
 +<h4>ownCloud/WebDAV<a class="headerlink" href="#owncloud-webdav" title="Permalink to this headline">¶</a></h4>
 +<p>Mounts a folder on a WebDAV server (or another ownCloud instance via WebDAV).</p>
 +<p><img alt="10000000000005F70000005F0912E904_png" src="../../_images/10000000000005F70000005F0912E904.png" style="width: 6.5in; height: 0.4043in;" /></p>
 +<ul class="simple">
 +<li>URL – The hostname of the WebDAV server.</li>
 +<li>Username – The username used to login to the WebDAV server.</li>
 +<li>Password – The password used to login to the WebDAV server.</li>
 +<li>Root – The folder inside the WebDav server to mount (optional, defaults to ‘/’)</li>
 +<li>Secure <tt class="docutils literal"><span class="pre">https://</span></tt> - Whether to use <tt class="docutils literal"><span class="pre">https://</span></tt> to connect to the WebDav server instead of <tt class="docutils literal"><span class="pre">http://</span></tt></li>
 +<li>Applicable – A list users of who can see this mount</li>
 +</ul>
 +<p><img alt="10000000000005B90000007866D92D14_png" src="../../_images/10000000000005B90000007866D92D14.png" style="width: 6.5in; height: 0.5319in;" /></p>
 +<div class="admonition note">
 +<p class="first admonition-title">Note</p>
 +<p class="last">When configured correctly, a Green Light will appear next to the
 +Folder Name.  If misconfigured, a Red Light will appear.</p>
 +</div>
 +<p><img alt="10000000000005E20000009B1BA5A8CF_png" src="../../_images/10000000000005E20000009B1BA5A8CF.png" style="width: 6.5in; height: 0.6689in;" /></p>
 +</div>
 +<div class="section" id="sftp">
 +<h4>SFTP<a class="headerlink" href="#sftp" title="Permalink to this headline">¶</a></h4>
 +<p>Mounts a folder on a remote SSH server.</p>
 +<p><img alt="10000000000005FF0000005F35710398_png" src="../../_images/10000000000005FF0000005F35710398.png" style="width: 6.5in; height: 0.402in;" /></p>
 +<ul class="simple">
 +<li>URL – The hostname of the SSH server.</li>
 +<li>Username – The username used to login to the SSH server.</li>
 +<li>Password – The password used to login to the SSH server.</li>
 +<li>Root – The folder inside the SSH server to mount (optional, defaults to ‘/’)</li>
 +<li>Applicable – A list users of who can see this mount</li>
 +</ul>
 +<p><img alt="10000000000005970000006AE23997C9_png" src="../../_images/10000000000005970000006AE23997C9.png" style="width: 6.5in; height: 0.4811in;" /></p>
 +<div class="admonition note">
 +<p class="first admonition-title">Note</p>
 +<p class="last">When configured correctly, a Green Light will appear next to the
 +Folder Name.  If misconfigured, a Red Light will appear.</p>
 +</div>
 +<p><img alt="10000000000005EB000000A68BA73E2D_png" src="../../_images/10000000000005EB000000A68BA73E2D.png" style="width: 6.5in; height: 0.7126in;" /></p>
 +</div>
 +<div class="section" id="irods">
 +<h4>iRODS<a class="headerlink" href="#irods" title="Permalink to this headline">¶</a></h4>
 +<p>Mounts a folder on a iRODS server.</p>
 +<p><img alt="100000000000062A0000005F61A18950_png" src="../../_images/100000000000062A0000005F61A18950.png" style="width: 6.5in; height: 0.3909in;" /></p>
 +<ul class="simple">
 +<li>Host</li>
 +<li>Port</li>
 +<li>Use ownCloud login</li>
 +<li>Username</li>
 +<li>Password</li>
 +<li>Authentication Mode</li>
 +<li>Zone</li>
 +<li>Applicable – A list users of who can see this mount</li>
 +</ul>
 +<div class="admonition note">
 +<p class="first admonition-title">Note</p>
 +<p class="last">When configured correctly, a Green Light will appear next to the
 +Folder Name.  If misconfigured, a Red Light will appear.</p>
 +</div>
 +</div>
 +</div>
 +<div class="section" id="configuration-file">
 +<h3>Configuration File<a class="headerlink" href="#configuration-file" title="Permalink to this headline">¶</a></h3>
 +<p>The configuration of mounts created within the External Storage App are stored in the
 +<tt class="docutils literal"><span class="pre">data/mount.json</span></tt> file.
 +This file contains all settings in JSON (JavaScript Object Notation) format.
 +Two different types of entries exist:</p>
 +<ul class="simple">
 +<li>Group mounts -
 +Each entry configures a mount for each user in group</li>
 +<li>User mount – Each entry configures a mount for a single user or all users.</li>
 +</ul>
 +<p>For each type, there is a JSON array with the user/group name as key and an array of configuration values as the value.
 +Each entry consist of the class name of the storage backend and an array of backend specific options (described above) and will be replaced by the user login.</p>
 +<p>Although configuration may be done by making modifications to the mount.json file, it is recommended to use the Web-GUI in the administrator panel (as described in the above section) to add, remove, or modify mount options in order to prevent any problems.</p>
 +</div>
 +</div>
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/apps/files_sharing/index.html
index d3c8ee1,0000000..aa81bd3
mode 100644,000000..100644
--- a/core/doc/admin/apps/files_sharing/index.html
+++ b/core/doc/admin/apps/files_sharing/index.html
@@@ -1,258 -1,0 +1,261 @@@
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>Sharing — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="../../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../../_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="../../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../../_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '../../',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="../../_static/jquery.js"></script>
 +    <script type="text/javascript" src="../../_static/underscore.js"></script>
 +    <script type="text/javascript" src="../../_static/doctools.js"></script>
 +    <script type="text/javascript" src="../../_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../../index.html" />
 +    <link rel="up" title="Apps" href="../index.html" />
 +    <link rel="next" title="Deleted Files" href="../files_trashbin/index.html" />
 +    <link rel="prev" title="External storage support" href="../files_external/index.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="../../contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="../../contents.html">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="../../index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
 +<ul class="current">
 +<li class="toctree-l1"><a class="reference internal" href="../../installation/index.html">Installation</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../../configuration/index.html">Configuration</a></li>
 +<li class="toctree-l1 current"><a class="reference internal" href="../index.html">Apps</a><ul class="current">
 +<li class="toctree-l2"><a class="reference internal" href="../activity/index.html">Activity</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../admin_dependencies_chk/index.html">Finding Deployment Dependencies</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../files_antivirus/index.html">File Antivirus Engine</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../files_encryption/index.html">Encryption</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../files_external/index.html">External storage support</a></li>
 +<li class="toctree-l2 current"><a class="current reference internal" href="">Sharing</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="#configuration">Configuration</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="#utilization">Utilization</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="#retrieving-shared-data">Retrieving shared data</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="../files_trashbin/index.html">Deleted Files</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../files_versions/index.html">Versions</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../firstrunwizard/index.html">First Run Wizard</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../user_ldap/index.html">LDAP user and group backend</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../viewers/index.html">File Viewers</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l1"><a class="reference internal" href="../../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../sharing_api/index.html">Sharing API</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../../config/index.html">The Configuration File</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../../issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <div class="section" id="sharing">
 +<h1>Sharing<a class="headerlink" href="#sharing" title="Permalink to this headline">¶</a></h1>
 +<p>ownCloud allows users to share files and folders with both other ownCloud
 +users, as well as publicly via a link.  Sharing may be done either via the web
 +interface or via the Sharing API.  This document will discuss the web interface
 +and sharing. For information on the Sharing API, please refer to that document.</p>
 +<div class="section" id="configuration">
 +<h2>Configuration<a class="headerlink" href="#configuration" title="Permalink to this headline">¶</a></h2>
 +<div class="section" id="enable-the-app">
 +<h3>Enable the app<a class="headerlink" href="#enable-the-app" title="Permalink to this headline">¶</a></h3>
 +<p>The Share Files app is enabled by default. To verify this and/or disable this functionality,
 +navigate to the APPS page in the web interface and select “Share Files”</p>
 +<p><img alt="1000000000000167000000B43E4BF478_png" src="../../_images/1000000000000167000000B43E4BF478.png" style="width: 3.7398in; height: 1.8752in;" /></p>
 +</div>
 +<div class="section" id="configuring-the-permitted-functionality">
 +<h3>Configuring the permitted functionality<a class="headerlink" href="#configuring-the-permitted-functionality" title="Permalink to this headline">¶</a></h3>
 +<p>There are several functions which may be enabled or disabled at the admin’s discretion.
 +To configure these functions, navigate to the Admin page in the web interface and scroll to the “Sharing” section.</p>
 +<p><img alt="10000000000001CF00000176B0BE1EBC_png" src="../../_images/10000000000001CF00000176B0BE1EBC.png" style="width: 4.8228in; height: 3.8957in;" /></p>
 +<p>The above parameters are self-explanatory and may be enabled or disabled as required.</p>
 +</div>
 +</div>
 +<div class="section" id="utilization">
 +<h2>Utilization<a class="headerlink" href="#utilization" title="Permalink to this headline">¶</a></h2>
 +<p>An ownCloud user may share files or entire folders with other individuals.
 +The method of sharing is the same.</p>
 +<div class="section" id="share-with-another-owncloud-user">
 +<h3>Share with another ownCloud user<a class="headerlink" href="#share-with-another-owncloud-user" title="Permalink to this headline">¶</a></h3>
 +<p>Hover over the line containing the file or folder to be shared.
 +And then select Share.
 +The following dialog appears.</p>
 +<p><img alt="10000000000003EC000000AB60616FA7_png" src="../../_images/10000000000003EC000000AB60616FA7.png" style="width: 6.5in; height: 1.1071in;" /></p>
 +<p>In the “share with user or group” text box, enter the user to share with, or the group to share with.
 +Note, as letters are typed, the users and groups who match the typed string will appear.
 +As a short cut, simply select the desired user/group</p>
 +</div>
 +<div class="section" id="setting-permissions-on-the-share">
 +<h3>Setting Permissions on the share<a class="headerlink" href="#setting-permissions-on-the-share" title="Permalink to this headline">¶</a></h3>
 +<p>When a file or folder is shared, the permissions may be modified stating what the other user may do with the file/folder.
 +Once the share with user or group has been entered, the dialog will expand as follows.</p>
 +<p><img alt="1000000000000404000000FCFC13E732_png" src="../../_images/1000000000000404000000FCFC13E732.png" style="width: 6.5in; height: 1.5929in;" /></p>
 +<p>If the shared with user has an email address configured, the sharing user may choose to notify the shared with user of the share.
 +To do this, select the checkbox next to “notify by email”.
 +It is important to note, this checkbox appears whether or not the shared with user has email configured.</p>
 +<p>When sharing a file/folder, it is obvious that the file may be viewed or downloaded.
 +However, if the shared with user is allowed to modify the file in any way, the “can edit” box should be checked.
 +The sharing user may allow the shared with user to update, delete, or re-share the file.
 +Note, by default, all permissions are set.</p>
 +<p>It should be noted that when sharing a folder, an additional permission, “create” is available.
 +When enabled, the shared to users can create new files and folders within the shared folder.</p>
 +</div>
 +<div class="section" id="share-as-a-link">
 +<h3>Share as a link<a class="headerlink" href="#share-as-a-link" title="Permalink to this headline">¶</a></h3>
 +<p>In the event that an ownCloud user desires to share a file with a non-ownCloud user, the file may be shared as a link.
 +To share as a link, hover over the line containing the file and select Share.
 +Then select the check box next to “Share link”</p>
 +<p><img alt="10000000000003E8000001524A147A04_png" src="../../_images/10000000000003E8000001524A147A04.png" style="width: 6.5in; height: 2.1965in;" /></p>
 +<p>The link is then shown in the text box.
 +The link may be copied and pasted into an email and sent to the other user.
 +Alternatively, if email is setup within ownCloud, the sharing user may input the shared with user’s email address in the text box and select send.
 +The shared user will then receive an email from the ownCloud server with the link.</p>
 +<p>There may be circumstances where the file owner wants some security on the link so it cannot be accessed by anyone other than the desired person.
 +To do this, the link may be Password Protected by selecting the “Password Protect” checkbox and entering a desired password.</p>
 +<p><img alt="1000000000000403000001632F0B76F6_png" src="../../_images/1000000000000403000001632F0B76F6.png" style="width: 6.5in; height: 2.2465in;" /></p>
 +</div>
 +<div class="section" id="setting-expiration-date">
 +<h3>Setting Expiration Date<a class="headerlink" href="#setting-expiration-date" title="Permalink to this headline">¶</a></h3>
 +<p>ownCloud allows the sharing user to expire a file or folder share at a given date.
 +This expiration applies to all shares within the folder as well.
 +So, if a user expires a folder share, all files within the folder will no longer be shared.</p>
 +<p>To set an expiration, select the Set expiration date checkbox and then select the expiration date.
 +(The calendar will appear when the mouse is clicked in the Expiration date text box.</p>
 +<p><img alt="10000000000004010000017E4A6552BC_png" src="../../_images/10000000000004010000017E4A6552BC.png" style="width: 6.5in; height: 2.422in;" /></p>
 +</div>
 +</div>
 +<div class="section" id="retrieving-shared-data">
 +<h2>Retrieving shared data<a class="headerlink" href="#retrieving-shared-data" title="Permalink to this headline">¶</a></h2>
 +<div class="section" id="user-group-shares">
 +<h3>User/group shares<a class="headerlink" href="#user-group-shares" title="Permalink to this headline">¶</a></h3>
 +<p>When the shared with user logs into their ownCloud instance they will see a “Shared” folder.</p>
 +<p><img alt="100000000000046C000000C2D3E5CF30_png" src="../../_images/100000000000046C000000C2D3E5CF30.png" style="width: 6.5in; height: 1.1138in;" /></p>
 +<p>Within that Shared folder are all files and folders which have been shared to that user by any other ownCloud user.</p>
 +<p><img alt="1000000000000462000000D44541CF9A_png" src="../../_images/1000000000000462000000D44541CF9A.png" style="width: 6.5in; height: 1.2283in;" /></p>
 +</div>
 +<div class="section" id="share-as-link">
 +<h3>Share as link<a class="headerlink" href="#share-as-link" title="Permalink to this headline">¶</a></h3>
 +<p>To view a file/folder which was shared as a link, simply enter the link into the browser.</p>
 +<p><img alt="10000000000004CA000002B52116BE0C_png" src="../../_images/10000000000004CA000002B52116BE0C.png" style="width: 6.5in; height: 3.6744in;" /></p>
 +<p>To download the file/folder select the Download button on the upper right of the page.
 +If this link was password protected, the user will be prompted with a password prior to this page appearing.</p>
 +<p><img alt="100000000000045800000197FE462F2B_png" src="../../_images/100000000000045800000197FE462F2B.png" style="width: 6.5in; height: 2.3791in;" /></p>
 +</div>
 +</div>
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/apps/files_trashbin/index.html
index a4b93e3,0000000..46417b9
mode 100644,000000..100644
--- a/core/doc/admin/apps/files_trashbin/index.html
+++ b/core/doc/admin/apps/files_trashbin/index.html
@@@ -1,277 -1,0 +1,280 @@@
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>Deleted Files — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="../../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../../_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="../../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../../_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '../../',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="../../_static/jquery.js"></script>
 +    <script type="text/javascript" src="../../_static/underscore.js"></script>
 +    <script type="text/javascript" src="../../_static/doctools.js"></script>
 +    <script type="text/javascript" src="../../_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../../index.html" />
 +    <link rel="up" title="Apps" href="../index.html" />
 +    <link rel="next" title="Versions" href="../files_versions/index.html" />
 +    <link rel="prev" title="Sharing" href="../files_sharing/index.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="../../contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="../../contents.html">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="../../index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
 +<ul class="current">
 +<li class="toctree-l1"><a class="reference internal" href="../../installation/index.html">Installation</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../../configuration/index.html">Configuration</a></li>
 +<li class="toctree-l1 current"><a class="reference internal" href="../index.html">Apps</a><ul class="current">
 +<li class="toctree-l2"><a class="reference internal" href="../activity/index.html">Activity</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../admin_dependencies_chk/index.html">Finding Deployment Dependencies</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../files_antivirus/index.html">File Antivirus Engine</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../files_encryption/index.html">Encryption</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../files_external/index.html">External storage support</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../files_sharing/index.html">Sharing</a></li>
 +<li class="toctree-l2 current"><a class="current reference internal" href="">Deleted Files</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="#expiry-of-deleted-files">Expiry of deleted files</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="#configuration-and-storage">Configuration and storage</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="#utilization">Utilization</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="../files_versions/index.html">Versions</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../firstrunwizard/index.html">First Run Wizard</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../user_ldap/index.html">LDAP user and group backend</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../viewers/index.html">File Viewers</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l1"><a class="reference internal" href="../../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../sharing_api/index.html">Sharing API</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../../config/index.html">The Configuration File</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../../issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <div class="section" id="deleted-files">
 +<h1>Deleted Files<a class="headerlink" href="#deleted-files" title="Permalink to this headline">¶</a></h1>
 +<p>The ownCloud server stores deleted files in a temporary area in the event that the file was inadvertently deleted and/or needs to be restored.</p>
 +<div class="section" id="expiry-of-deleted-files">
 +<h2>Expiry of deleted files<a class="headerlink" href="#expiry-of-deleted-files" title="Permalink to this headline">¶</a></h2>
 +<p>There are two instances in which ownCloud will automatically permanently remove a deleted file.</p>
 +<div class="section" id="disk-utilization">
 +<h3>Disk Utilization<a class="headerlink" href="#disk-utilization" title="Permalink to this headline">¶</a></h3>
 +<p>To prevent a user from running out of disk space, the ownCloud deleted files app will not utilize more than 50% of the currently available free space for deleted files.
 +If the deleted files exceed this limit, ownCloud deletes the oldest files until it gets below this limit.</p>
 +</div>
 +<div class="section" id="age">
 +<h3>Age<a class="headerlink" href="#age" title="Permalink to this headline">¶</a></h3>
 +<p>By default, deleted files remain in the trash bin for 30 days.
 +This can be configured using the trashbin_retention_obligation parameter
 +in the <tt class="docutils literal"><span class="pre">config.php</span></tt> file.
 +Files older than the configured value (or default 30 days) will be permanently deleted.
 +ownCloud checks the age of the files each time a new file is moved to the deleted files bin.</p>
 +</div>
 +</div>
 +<div class="section" id="configuration-and-storage">
 +<h2>Configuration and storage<a class="headerlink" href="#configuration-and-storage" title="Permalink to this headline">¶</a></h2>
 +<div class="section" id="configuration">
 +<h3>Configuration<a class="headerlink" href="#configuration" title="Permalink to this headline">¶</a></h3>
 +<p>By default, the ownCloud deleted files app is enabled.
 +To verify or disable, navigate to the apps
 +page and select Deleted Files.</p>
 +<p><img alt="100000000000042F000000CC3EDDE79E_png" src="../../_images/100000000000042F000000CC3EDDE79E.png" style="width: 6.5in; height: 1.2382in;" /></p>
 +</div>
 +<div class="section" id="storage">
 +<h3>Storage<a class="headerlink" href="#storage" title="Permalink to this headline">¶</a></h3>
 +<p>Once a file has been deleted by the user, it is moved to the <tt class="docutils literal"><span class="pre">~/data/<user>/files_trashbin/files</span></tt> folder.</p>
 +<p><img alt="10000000000002B3000000365E1CD00D_png" src="../../_images/10000000000002B3000000365E1CD00D.png" style="width: 6.5in; height: 0.5075in;" /></p>
 +<p>The remaining directories retain information on encryption key files, and versions.</p>
 +</div>
 +</div>
 +<div class="section" id="utilization">
 +<h2>Utilization<a class="headerlink" href="#utilization" title="Permalink to this headline">¶</a></h2>
 +<p>The deleted files app, when enabled, automatically moves deleted files to the Deleted Files folder and leaves them available for restore or permanent deletion</p>
 +<div class="section" id="delete-a-file">
 +<h3>Delete a file<a class="headerlink" href="#delete-a-file" title="Permalink to this headline">¶</a></h3>
 +<p>To delete a file, either select the file check box and select Delete
 +on the upper right of the screen, or the “x” to the right of the file.</p>
 +<p><img alt="1000000000000530000001410CF0028A_png" src="../../_images/1000000000000530000001410CF0028A.png" style="width: 6.5in; height: 1.5701in;" /></p>
 +<p>To delete multiple files simultaneously, select the check box on all the desired files, then select Delete
 +on the upper right of the screen.</p>
 +</div>
 +<div class="section" id="view-deleted-files">
 +<h3>View Deleted Files<a class="headerlink" href="#view-deleted-files" title="Permalink to this headline">¶</a></h3>
 +<p>To view a list of the deleted files, select the Deleted files
 +button on the upper right of the browser.</p>
 +<p><img alt="1000000000000532000000285DDBBF37_png" src="../../_images/1000000000000532000000285DDBBF37.png" style="width: 6.5in; height: 0.1957in;" /></p>
 +<p>Once selected, a list of all deleted files will appear.</p>
 +</div>
 +<div class="section" id="restore-files">
 +<h3>Restore files<a class="headerlink" href="#restore-files" title="Permalink to this headline">¶</a></h3>
 +<p>As with deleting files, there are two ways to restore a file.
 +Either select the check box next to the file (or for bulk restore – files) and select restore
 +on the upper right.
 +Or hover over the file and select restore
 +.</p>
 +<p><img alt="1000000000000527000000A7AB409FE0_png" src="../../_images/1000000000000527000000A7AB409FE0.png" style="width: 6.5in; height: 0.8228in;" />
 +<img alt="100000000000052500000088DBB95005_png" src="../../_images/100000000000052500000088DBB95005.png" style="width: 6.5in; height: 0.6717in;" /></p>
 +</div>
 +<div class="section" id="permanently-delete-files">
 +<h3>Permanently Delete Files<a class="headerlink" href="#permanently-delete-files" title="Permalink to this headline">¶</a></h3>
 +<p>Files in the Deleted Files
 +folder can be permanently deleted.
 +To do this, either select the check box next to the file (or for bulk deletion – files) and select Delete in the upper right corner.
 +Or hover over the file and select the “x”.</p>
 +</div>
 +<div class="section" id="nested-files-and-restore">
 +<h3>Nested files and restore<a class="headerlink" href="#nested-files-and-restore" title="Permalink to this headline">¶</a></h3>
 +<p>If, for instance, the directory structure within ownCloud is
 +<em>~/public/support/documentation/ownCloud undelete</em>
 +.</p>
 +<p><img alt="1000000000000525000000BE30CF0423_png" src="../../_images/1000000000000525000000BE30CF0423.png" style="width: 6.5in; height: 0.9374in;" /></p>
 +<div class="section" id="delete-entire-directory-structure">
 +<h4>Delete entire directory structure<a class="headerlink" href="#delete-entire-directory-structure" title="Permalink to this headline">¶</a></h4>
 +<p>When the public folder is deleted, all child folders/files will also be deleted.</p>
 +<p><img alt="100000000000052F000000C2867B7294_png" src="../../_images/100000000000052F000000C2867B7294.png" style="width: 6.5in; height: 0.95in;" /></p>
 +<p>Suppose the file “ownCloud undelete.docx” was still required.
 +A restore of the file will place it in the ‘root’ directory of the Files folder.</p>
 +</div>
 +<div class="section" id="delete-only-the-file">
 +<h4>Delete only the file<a class="headerlink" href="#delete-only-the-file" title="Permalink to this headline">¶</a></h4>
 +<p>If the file “ownCloud undelete.docx”
 +was accidentally deleted, it may be restored following the steps described in section
 +.
 +The restore will place the file back into the directory structure from where it came.</p>
 +</div>
 +<div class="section" id="delete-the-file-then-the-directory-structure">
 +<h4>Delete the file then the directory structure<a class="headerlink" href="#delete-the-file-then-the-directory-structure" title="Permalink to this headline">¶</a></h4>
 +<p>If the file “ownCloud undelete.docs”
 +is deleted, then the entire directory structure is deleted, the file will appear in the ‘root’ of the Deleted Files folder.</p>
 +<p><img alt="1000000000000523000000C6F786381C_png" src="../../_images/1000000000000523000000C6F786381C.png" style="width: 6.5in; height: 0.9783in;" /></p>
 +<p>A restore of “ownCloud undelete.docx”
 +will place it in the user’s ownCloud root directory.</p>
 +<p><img alt="100000000000053100000142D9A4C916_png" src="../../_images/100000000000053100000142D9A4C916.png" style="width: 6.5in; height: 1.5752in;" /></p>
 +</div>
 +</div>
 +<div class="section" id="shared-files-and-restore">
 +<h3>Shared files and restore<a class="headerlink" href="#shared-files-and-restore" title="Permalink to this headline">¶</a></h3>
 +<p>When a
 +shared file is deleted, the file will be deleted from the shared to user as well.
 +Upon restore of the file by the file owner, the file is no longer shared.</p>
 +</div>
 +<div class="section" id="restore-files-with-versions">
 +<h3>Restore files with Versions<a class="headerlink" href="#restore-files-with-versions" title="Permalink to this headline">¶</a></h3>
 +<p>When a file which has versions has been deleted, and then restored, the versions will exist upon restoration.</p>
 +</div>
 +</div>
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/apps/files_versions/index.html
index c829273,0000000..be4c16e
mode 100644,000000..100644
--- a/core/doc/admin/apps/files_versions/index.html
+++ b/core/doc/admin/apps/files_versions/index.html
@@@ -1,271 -1,0 +1,274 @@@
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>Versions — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="../../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../../_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="../../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../../_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '../../',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="../../_static/jquery.js"></script>
 +    <script type="text/javascript" src="../../_static/underscore.js"></script>
 +    <script type="text/javascript" src="../../_static/doctools.js"></script>
 +    <script type="text/javascript" src="../../_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../../index.html" />
 +    <link rel="up" title="Apps" href="../index.html" />
 +    <link rel="next" title="First Run Wizard" href="../firstrunwizard/index.html" />
 +    <link rel="prev" title="Deleted Files" href="../files_trashbin/index.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="../../contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="../../contents.html">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="../../index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
 +<ul class="current">
 +<li class="toctree-l1"><a class="reference internal" href="../../installation/index.html">Installation</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../../configuration/index.html">Configuration</a></li>
 +<li class="toctree-l1 current"><a class="reference internal" href="../index.html">Apps</a><ul class="current">
 +<li class="toctree-l2"><a class="reference internal" href="../activity/index.html">Activity</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../admin_dependencies_chk/index.html">Finding Deployment Dependencies</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../files_antivirus/index.html">File Antivirus Engine</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../files_encryption/index.html">Encryption</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../files_external/index.html">External storage support</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../files_sharing/index.html">Sharing</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../files_trashbin/index.html">Deleted Files</a></li>
 +<li class="toctree-l2 current"><a class="current reference internal" href="">Versions</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="#expiry-of-versions">Expiry of versions</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="#space-limitations">Space limitations</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="#configuration-and-storage">Configuration and storage</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="#utilization">Utilization</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="../firstrunwizard/index.html">First Run Wizard</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../user_ldap/index.html">LDAP user and group backend</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../viewers/index.html">File Viewers</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l1"><a class="reference internal" href="../../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../sharing_api/index.html">Sharing API</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../../config/index.html">The Configuration File</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../../issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <div class="section" id="versions">
 +<h1>Versions<a class="headerlink" href="#versions" title="Permalink to this headline">¶</a></h1>
 +<p>The ownCloud Versions app maintains older versions of a file which have been
 +modified by an ownCloud user.</p>
 +<div class="section" id="expiry-of-versions">
 +<h2>Expiry of versions<a class="headerlink" href="#expiry-of-versions" title="Permalink to this headline">¶</a></h2>
 +<p>The versions app expires old versions automatically to make certain that the
 +user doesn’t run out of space.  The following algorithm is used to delete old
 +versions:</p>
 +<ul class="simple">
 +<li>ownCloud keeps one new version every 2 seconds for the first 10 seconds</li>
 +<li>ownCloud keeps one new version every minute for the first hour</li>
 +<li>ownCloud keeps one new version every hour for the first 24 hours</li>
 +<li>ownCloud keeps one new version every day for the first 30 days</li>
 +<li>ownCloud keeps one new version every week thereafter.</li>
 +</ul>
 +<p>The versions are adjusted along this algorithm every time a new version is created.</p>
 +</div>
 +<div class="section" id="space-limitations">
 +<h2>Space limitations<a class="headerlink" href="#space-limitations" title="Permalink to this headline">¶</a></h2>
 +<p>In addition to the expiry of versions, ownCloud’s versions app makes certain
 +never to use more than 50% of the user’s currently available free space.  If
 +stored versions exceed this limit, ownCloud will delete the oldest versions
 +first until it meets this limit.</p>
 +</div>
 +<div class="section" id="configuration-and-storage">
 +<h2>Configuration and storage<a class="headerlink" href="#configuration-and-storage" title="Permalink to this headline">¶</a></h2>
 +<div class="section" id="configuration">
 +<h3>Configuration<a class="headerlink" href="#configuration" title="Permalink to this headline">¶</a></h3>
 +<p>By default, the ownCloud versions app is enabled.
 +To verify or disable, navigate to the apps
 +page and select Versions.</p>
 +<p><img alt="1000000000000336000000F38C3FAF84_png" src="../../_images/1000000000000336000000F38C3FAF84.png" style="width: 6.5in; height: 1.9217in;" /></p>
 +</div>
 +<div class="section" id="storage">
 +<h3>Storage<a class="headerlink" href="#storage" title="Permalink to this headline">¶</a></h3>
 +<p>Previous versions of files are stored in the <tt class="docutils literal"><span class="pre">data/<user>/files_versions</span></tt> folder.</p>
 +<p><img alt="100000000000021C0000004CACBF786C_png" src="../../_images/100000000000021C0000004CACBF786C.png" style="width: 5.6252in; height: 0.7917in;" /></p>
 +<p>This directory is automatically created when the first file version is created.</p>
 +<p>The naming convention of the files in this directory are:</p>
 +<div class="highlight-python"><pre><file_name>.v<unix_timestamp></pre>
 +</div>
 +<p><img alt="10000000000002210000002DE3BE7515_png" src="../../_images/10000000000002210000002DE3BE7515.png" style="width: 5.6772in; height: 0.4689in;" /></p>
 +</div>
 +</div>
 +<div class="section" id="utilization">
 +<h2>Utilization<a class="headerlink" href="#utilization" title="Permalink to this headline">¶</a></h2>
 +<p>The versions app, when enabled, automatically creates a new version each time an existing, non-empty file is saved.</p>
 +<div class="section" id="initial-file-creation">
 +<h3>Initial File creation<a class="headerlink" href="#initial-file-creation" title="Permalink to this headline">¶</a></h3>
 +<p>Create a file on the ownCloud server – either directly via the browser, an upload, or a file sync from the client.
 +In this example, the file versionText.txt was created via the web browser.</p>
 +<p><img alt="1000000000000427000000324F58266D_png" src="../../_images/1000000000000427000000324F58266D.png" style="width: 6.5in; height: 0.3055in;" /></p>
 +<div class="section" id="note">
 +<h4>Note<a class="headerlink" href="#note" title="Permalink to this headline">¶</a></h4>
 +<p>Since this file was initially created via the web browser, it is an empty file.</p>
 +</div>
 +</div>
 +<div class="section" id="edit-the-file">
 +<h3>Edit the file<a class="headerlink" href="#edit-the-file" title="Permalink to this headline">¶</a></h3>
 +<p>Edit the file through the web browser.</p>
 +<p><img alt="100000000000019E0000004CD2A0F407_png" src="../../_images/100000000000019E0000004CD2A0F407.png" style="width: 4.3126in; height: 0.7917in;" /></p>
 +<p>And save.</p>
 +<div class="section" id="notes">
 +<h4>Notes<a class="headerlink" href="#notes" title="Permalink to this headline">¶</a></h4>
 +<p>Editing an empty file, as in this instance, for the first time, does not create a new version.</p>
 +</div>
 +</div>
 +<div class="section" id="create-version">
 +<h3>Create version<a class="headerlink" href="#create-version" title="Permalink to this headline">¶</a></h3>
 +<p>Edit the non-zero byte file either via the web browser, via the sync client or via an upload.</p>
 +<p><img alt="1000000000000194000000498325A766_png" src="../../_images/1000000000000194000000498325A766.png" style="width: 4.2083in; height: 0.7602in;" /></p>
 +<p>And save.</p>
 +<div class="section" id="id1">
 +<h4>Notes<a class="headerlink" href="#id1" title="Permalink to this headline">¶</a></h4>
 +<p>When performing an upload of a file which already exists on the server, a dialog box appears asking whether to keep the existing file or the new file.</p>
 +<p><img alt="10000000000001C1000000FE663748B2_png" src="../../_images/10000000000001C1000000FE663748B2.png" style="width: 4.6772in; height: 2.6457in;" /></p>
 +<p>In order to create a version, the New File must be selected.
 +If the Existing File is selected, the file is not replaced hence no new version is created.</p>
 +</div>
 +</div>
 +<div class="section" id="accessing-versions">
 +<h3>Accessing Versions<a class="headerlink" href="#accessing-versions" title="Permalink to this headline">¶</a></h3>
 +<p>In order to view what versions exist for a given file, hover over the line containing the file and select Versions
 +on the right side.</p>
 +<p><img alt="1000000000000430000000AF9D6E724E_png" src="../../_images/1000000000000430000000AF9D6E724E.png" style="width: 6.5in; height: 1.061in;" /></p>
 +<p>In this case, there are two previous versions of versionTest.txt
 +.
 +The thumbnail and creation time can be used to identify what was in the file in that version.</p>
 +</div>
 +<div class="section" id="reverting-to-a-different-version">
 +<h3>Reverting to a different version<a class="headerlink" href="#reverting-to-a-different-version" title="Permalink to this headline">¶</a></h3>
 +<p>To revert to a previous version, simply select the restore next to the version as seen in
 +.</p>
 +<div class="section" id="id2">
 +<h4>Notes<a class="headerlink" href="#id2" title="Permalink to this headline">¶</a></h4>
 +<p>In the instance where a file is reverted to another version, the “existing” version of the file is versioned and can be reverted at a later date.</p>
 +</div>
 +</div>
 +<div class="section" id="sharing-and-versions">
 +<h3>Sharing and Versions<a class="headerlink" href="#sharing-and-versions" title="Permalink to this headline">¶</a></h3>
 +<p>If user-A shares a file with user-B, user-B may revert the file to any previous version.
 +If user-B modifies the file, a new version is created.</p>
 +</div>
 +</div>
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/apps/firstrunwizard/index.html
index e7a371e,0000000..d1b529a
mode 100644,000000..100644
--- a/core/doc/admin/apps/firstrunwizard/index.html
+++ b/core/doc/admin/apps/firstrunwizard/index.html
@@@ -1,206 -1,0 +1,209 @@@
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>First Run Wizard — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="../../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../../_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="../../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../../_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '../../',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="../../_static/jquery.js"></script>
 +    <script type="text/javascript" src="../../_static/underscore.js"></script>
 +    <script type="text/javascript" src="../../_static/doctools.js"></script>
 +    <script type="text/javascript" src="../../_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../../index.html" />
 +    <link rel="up" title="Apps" href="../index.html" />
 +    <link rel="next" title="LDAP user and group backend" href="../user_ldap/index.html" />
 +    <link rel="prev" title="Versions" href="../files_versions/index.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="../../contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="../../contents.html">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="../../index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
 +<ul class="current">
 +<li class="toctree-l1"><a class="reference internal" href="../../installation/index.html">Installation</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../../configuration/index.html">Configuration</a></li>
 +<li class="toctree-l1 current"><a class="reference internal" href="../index.html">Apps</a><ul class="current">
 +<li class="toctree-l2"><a class="reference internal" href="../activity/index.html">Activity</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../admin_dependencies_chk/index.html">Finding Deployment Dependencies</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../files_antivirus/index.html">File Antivirus Engine</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../files_encryption/index.html">Encryption</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../files_external/index.html">External storage support</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../files_sharing/index.html">Sharing</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../files_trashbin/index.html">Deleted Files</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../files_versions/index.html">Versions</a></li>
 +<li class="toctree-l2 current"><a class="current reference internal" href="">First Run Wizard</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="#configuration">Configuration</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="#usage">Usage</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="#links">Links</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="../user_ldap/index.html">LDAP user and group backend</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../viewers/index.html">File Viewers</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l1"><a class="reference internal" href="../../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../sharing_api/index.html">Sharing API</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../../config/index.html">The Configuration File</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../../issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <div class="section" id="first-run-wizard">
 +<h1>First Run Wizard<a class="headerlink" href="#first-run-wizard" title="Permalink to this headline">¶</a></h1>
 +<p>The ownCloud First Run Wizard is a welcome screen which links users to the various ownCloud utilities such as the Sync Client, Mobile Apps, and WebDav</p>
 +<div class="section" id="configuration">
 +<h2>Configuration<a class="headerlink" href="#configuration" title="Permalink to this headline">¶</a></h2>
 +<p>The First Run Wizard app is enabled by default.
 +To verify or disable this app, navigate to the apps page and select “First Run Wizard”</p>
 +<p><img alt="1000000000000200000000BCCCC35DEB_png" src="../../_images/1000000000000200000000BCCCC35DEB.png" style="width: 5.3335in; height: 1.9583in;" /></p>
 +</div>
 +<div class="section" id="usage">
 +<h2>Usage<a class="headerlink" href="#usage" title="Permalink to this headline">¶</a></h2>
 +<p>When enabled, a user entering the ownCloud web browser for the first time will have the Welcome screen popup.</p>
 +<p><img alt="10000000000004920000028D9C8DC2CB_png" src="../../_images/10000000000004920000028D9C8DC2CB.png" style="width: 6.5in; height: 3.628in;" /></p>
 +<p>To close the window, select the ‘x’ in the upper right corner.
 +If the user would like to bring up this window at a later time, they may do so by navigating to the Personal menu selection and select “Show First Run Wizard again”</p>
 +<p><img alt="10000000000002A6000000BFBE298238_png" src="../../_images/10000000000002A6000000BFBE298238.png" style="width: 6.5in; height: 1.8311in;" /></p>
 +</div>
 +<div class="section" id="links">
 +<h2>Links<a class="headerlink" href="#links" title="Permalink to this headline">¶</a></h2>
 +<p>The wizard contains links for the Desktop app, Android App on Google Play, and iOS on the App store, as well as how to access files via WebDav.</p>
 +<div class="section" id="desktop-app">
 +<h3>Desktop App<a class="headerlink" href="#desktop-app" title="Permalink to this headline">¶</a></h3>
 +<p>Selecting the Desktop App link will bring the user to ownCloud’s web site to download the client.</p>
 +<p><img alt="1000000000000557000002E148BAB6D4_png" src="../../_images/1000000000000557000002E148BAB6D4.png" style="width: 6.5in; height: 3.5043in;" /></p>
 +</div>
 +<div class="section" id="android-app">
 +<h3>Android App<a class="headerlink" href="#android-app" title="Permalink to this headline">¶</a></h3>
 +<p>Selecting the Android App will load the web page to purchase the android client from the Google Play store.</p>
 +<p><img alt="1000000000000668000002D29EAD9899_png" src="../../_images/1000000000000668000002D29EAD9899.png" style="width: 6.5in; height: 2.861in;" /></p>
 +</div>
 +<div class="section" id="ios-app">
 +<h3>iOS App<a class="headerlink" href="#ios-app" title="Permalink to this headline">¶</a></h3>
 +<p>Selecting the iOS App loads the itunes web page to obtain the ownCloud iOS mobile client.</p>
 +<p><img alt="10000000000005F30000030F1372448D_png" src="../../_images/10000000000005F30000030F1372448D.png" style="width: 6.5in; height: 3.3417in;" /></p>
 +</div>
 +<div class="section" id="access-files-via-webdav">
 +<h3>Access files via WebDAV<a class="headerlink" href="#access-files-via-webdav" title="Permalink to this headline">¶</a></h3>
 +<p>This link brings up a link with documentation on how to access files on the ownCloud server using WebDAV.</p>
 +<p><img alt="100000000000066D000001AAD8CE8256_png" src="../../_images/100000000000066D000001AAD8CE8256.png" style="width: 6.5in; height: 1.6835in;" /></p>
 +</div>
 +</div>
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/apps/index.html
index 14908bd,0000000..2aa26d4
mode 100644,000000..100644
--- a/core/doc/admin/apps/index.html
+++ b/core/doc/admin/apps/index.html
@@@ -1,176 -1,0 +1,179 @@@
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>Apps — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '../',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="../_static/jquery.js"></script>
 +    <script type="text/javascript" src="../_static/underscore.js"></script>
 +    <script type="text/javascript" src="../_static/doctools.js"></script>
 +    <script type="text/javascript" src="../_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
 +    <link rel="next" title="Activity" href="activity/index.html" />
 +    <link rel="prev" title="Serving static files via web server" href="../configuration/xsendfile.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="../contents.html">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
 +<ul class="current">
 +<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
 +<li class="toctree-l1 current"><a class="current reference internal" href="">Apps</a><ul>
 +<li class="toctree-l2"><a class="reference internal" href="activity/index.html">Activity</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="admin_dependencies_chk/index.html">Finding Deployment Dependencies</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="files_antivirus/index.html">File Antivirus Engine</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="files_encryption/index.html">Encryption</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="files_external/index.html">External storage support</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="files_sharing/index.html">Sharing</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="files_trashbin/index.html">Deleted Files</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="files_versions/index.html">Versions</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="firstrunwizard/index.html">First Run Wizard</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="user_ldap/index.html">LDAP user and group backend</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="viewers/index.html">File Viewers</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../sharing_api/index.html">Sharing API</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../config/index.html">The Configuration File</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <div class="section" id="apps">
 +<h1>Apps<a class="headerlink" href="#apps" title="Permalink to this headline">¶</a></h1>
 +<div class="toctree-wrapper compound">
 +<ul>
 +<li class="toctree-l1"><a class="reference internal" href="activity/index.html">Activity</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="admin_dependencies_chk/index.html">Finding Deployment Dependencies</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="files_antivirus/index.html">File Antivirus Engine</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="files_encryption/index.html">Encryption</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="files_external/index.html">External storage support</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="files_sharing/index.html">Sharing</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="files_trashbin/index.html">Deleted Files</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="files_versions/index.html">Versions</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="firstrunwizard/index.html">First Run Wizard</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="user_ldap/index.html">LDAP user and group backend</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="viewers/index.html">File Viewers</a></li>
 +</ul>
 +</div>
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/apps/user_ldap/index.html
index f092bf6,0000000..29d2c0d
mode 100644,000000..100644
--- a/core/doc/admin/apps/user_ldap/index.html
+++ b/core/doc/admin/apps/user_ldap/index.html
@@@ -1,541 -1,0 +1,544 @@@
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>LDAP user and group backend — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="../../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../../_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="../../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../../_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '../../',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="../../_static/jquery.js"></script>
 +    <script type="text/javascript" src="../../_static/underscore.js"></script>
 +    <script type="text/javascript" src="../../_static/doctools.js"></script>
 +    <script type="text/javascript" src="../../_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../../index.html" />
 +    <link rel="up" title="Apps" href="../index.html" />
 +    <link rel="next" title="File Viewers" href="../viewers/index.html" />
 +    <link rel="prev" title="First Run Wizard" href="../firstrunwizard/index.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="../../contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="../../contents.html">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="../../index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
 +<ul class="current">
 +<li class="toctree-l1"><a class="reference internal" href="../../installation/index.html">Installation</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../../configuration/index.html">Configuration</a></li>
 +<li class="toctree-l1 current"><a class="reference internal" href="../index.html">Apps</a><ul class="current">
 +<li class="toctree-l2"><a class="reference internal" href="../activity/index.html">Activity</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../admin_dependencies_chk/index.html">Finding Deployment Dependencies</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../files_antivirus/index.html">File Antivirus Engine</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../files_encryption/index.html">Encryption</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../files_external/index.html">External storage support</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../files_sharing/index.html">Sharing</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../files_trashbin/index.html">Deleted Files</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../files_versions/index.html">Versions</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../firstrunwizard/index.html">First Run Wizard</a></li>
 +<li class="toctree-l2 current"><a class="current reference internal" href="">LDAP user and group backend</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="#configuration">Configuration</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="../viewers/index.html">File Viewers</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l1"><a class="reference internal" href="../../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../sharing_api/index.html">Sharing API</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../../config/index.html">The Configuration File</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../../issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <div class="section" id="ldap-user-and-group-backend">
 +<h1>LDAP user and group backend<a class="headerlink" href="#ldap-user-and-group-backend" title="Permalink to this headline">¶</a></h1>
 +<p>ownCloud ships an LDAP backend, which allows full use of ownCloud for user logging with LDAP credentials including:</p>
 +<ul class="simple">
 +<li>LDAP group support</li>
 +<li>File sharing with users and groups</li>
 +<li>Access via WebDAV and of course ownCloud Desktop Client</li>
 +<li>Versioning, external Storages and all other ownCloud features.</li>
 +</ul>
 +<div class="section" id="configuration">
 +<h2>Configuration<a class="headerlink" href="#configuration" title="Permalink to this headline">¶</a></h2>
 +<div class="section" id="enable-ldap-app">
 +<h3>Enable LDAP app<a class="headerlink" href="#enable-ldap-app" title="Permalink to this headline">¶</a></h3>
 +<p>From the APPs page, select “LDAP user and group backend” and select enable</p>
 +<p><img alt="1000020100000359000000A8B848DE68_png" src="../../_images/1000020100000359000000A8B848DE68.png" /></p>
 +</div>
 +<div class="section" id="configuring-ldap">
 +<h3>Configuring LDAP<a class="headerlink" href="#configuring-ldap" title="Permalink to this headline">¶</a></h3>
 +<p>The configuration of the LDAP feature is performed on the Admin page of the ownCloud web browser.
 +The configuration follows a wizard-like approach split into four tabs.
 +The first tab must be completed correctly to allow access to subsequent tabs.
 +Although the configuration in the remaining tabs is detected automatically, it should be reviewed by the admin to verify correctness.
 +An indicator exists on the all pages
 +to show whether the configuration is valid, incomplete, or incorrect.</p>
 +<p>Configuration settings are saved automatically when the cursor is no longer focused on the input element.</p>
 +<div class="section" id="server-tab">
 +<h4>Server Tab<a class="headerlink" href="#server-tab" title="Permalink to this headline">¶</a></h4>
 +<p>The server tab contains basic information on the LDAP server.
 +It makes certain that ownCloud can connect to the desired LDAP and read data from it.
 +At a minimum, the admin must provide a hostname for the LDAP server.
 +If anonymous access to the LDAP server is not allowed, the admin will be required to enter an account Distinguished Name (DN) and password.
 +ownCloud will auto-detect the port and base DN.</p>
 +<div class="section" id="server">
 +<h5>Server<a class="headerlink" href="#server" title="Permalink to this headline">¶</a></h5>
 +<p>ownCloud can be configured to connect to multiple LDAP servers.
 +Using this control you can pick a configuration you want to edit or to add a new one.
 +The button
 +Delete Configuration deletes the current configuration.</p>
 +</div>
 +<div class="section" id="host">
 +<h5>Host<a class="headerlink" href="#host" title="Permalink to this headline">¶</a></h5>
 +<p>The hostname of the LDAP server.
 +It can also be a <tt class="docutils literal"><span class="pre">ldaps://</span></tt> URI.
 +It is possible to pass a port number which will speed up port detection.
 +This is especially useful if a custom port is used.
 +ownCloud will subsequently move the port value to the port field.</p>
 +<p>Examples:</p>
 +<div class="highlight-python"><pre>directory.my-company.com
 +ldaps://directory.my-company.com
 +directory.my-company.com:9876</pre>
 +</div>
 +</div>
 +<div class="section" id="port">
 +<h5>Port<a class="headerlink" href="#port" title="Permalink to this headline">¶</a></h5>
 +<p>This is the port which ownCloud should utilize to connect to the LDAP server.
 +Upon initial configuration, this field is disabled.
 +ownCloud will auto-detect the port if it is running on a standard port (389).
 +After ownCloud detects the port, the field will be enabled for admin input.
 +A successfully discovered port will be inserted by ownCloud.</p>
 +</div>
 +<div class="section" id="user-dn">
 +<h5>User DN<a class="headerlink" href="#user-dn" title="Permalink to this headline">¶</a></h5>
 +<p>The name as DN of a user who is able to do searches in the LDAP directory.
 +For anonymous access, leave this field blank.
 +It is recommended to have a special system user for ownCloud.
 +This information is provided by the LDAP admin.</p>
 +</div>
 +<div class="section" id="password">
 +<h5>Password<a class="headerlink" href="#password" title="Permalink to this headline">¶</a></h5>
 +<p>The password for the user given above.
 +For anonymous access, leave this blank.
 +This information is provided by the LDAP admin.</p>
 +</div>
 +<div class="section" id="base-dn">
 +<h5>Base DN<a class="headerlink" href="#base-dn" title="Permalink to this headline">¶</a></h5>
 +<p>The base DM of the LDAP from where all users and groups can be reached.
 +It is possible to provide separated base DN’s for users and groups in the advanced tab.
 +This is a mandatory field.
 +ownCloud will attempt to determine the proper value of this field based on the provided User DN or Host values.</p>
 +<p><img alt="100000000000043200000169BCD20493_png" src="../../_images/100000000000043200000169BCD20493.png" style="width: 6.5in; height: 2.1846in;" /></p>
 +</div>
 +</div>
 +<div class="section" id="user-filter">
 +<h4>User Filter<a class="headerlink" href="#user-filter" title="Permalink to this headline">¶</a></h4>
 +<p>The settings in the User Filter tab determine which LDAP users will appear and will be able to log into ownCloud.
 +This may be configured using the wizard or entered via a raw LDAP filter.</p>
 +<div class="section" id="only-those-object-classes">
 +<h5>Only those object classes<a class="headerlink" href="#only-those-object-classes" title="Permalink to this headline">¶</a></h5>
 +<p>ownCloud will determine the available object classes.
 +ownCloud will automatically select the object that contains the highest number of users.
 +It is possible to select multiple object classes.</p>
 +</div>
 +<div class="section" id="only-from-those-groups">
 +<h5>Only from those groups<a class="headerlink" href="#only-from-those-groups" title="Permalink to this headline">¶</a></h5>
 +<p>This is used if the LDAP server supports the member-of-overlay in LDAP filters.
 +It allows the admin to define the users from one or more certain groups that are allowed to appear and log into ownCloud.
 +No value is selected by default.
 +It is possible to select multiple groups.</p>
 +<p>If the LDAP server does not support member-of-overlay in LDAP filters, the field is disabled.</p>
 +</div>
 +<div class="section" id="edit-raw-filter-instead">
 +<h5>Edit raw filter instead<a class="headerlink" href="#edit-raw-filter-instead" title="Permalink to this headline">¶</a></h5>
 +<p>Selecting this text will toggle the filter mode.
 +Instead of the wizard’s assistance, the admin may enter the raw LDAP filter in this field.</p>
 +<p>Example:</p>
 +<div class="highlight-python"><div class="highlight"><pre><span class="n">objectClass</span><span class="o">=</span><span class="n">inetOrgPerson</span>
 +</pre></div>
 +</div>
 +</div>
 +<div class="section" id="x-users-found">
 +<h5>x users found<a class="headerlink" href="#x-users-found" title="Permalink to this headline">¶</a></h5>
 +<p>Indicates the approximate number of users allowed to access ownCloud.
 +This number will update after any changes made to the LDAP configuration.</p>
 +<p><img alt="100000000000042500000163D2B339D5_png" src="../../_images/100000000000042500000163D2B339D5.png" style="width: 6.5in; height: 2.1752in;" /></p>
 +</div>
 +</div>
 +<div class="section" id="login-filter">
 +<h4>Login Filter<a class="headerlink" href="#login-filter" title="Permalink to this headline">¶</a></h4>
 +<p>The settings in the login filter tab determine which user information will be compared to login credentials entered by the user.
 +It is possible to allow multiple user details.
 +It is also possible to enter a raw LDAP filter.</p>
 +<div class="section" id="ldap-username">
 +<h5>LDAP Username<a class="headerlink" href="#ldap-username" title="Permalink to this headline">¶</a></h5>
 +<p>If checked, the login credentials will be compared to the username in the LDAP directory.
 +The corresponding attribute, usually <tt class="docutils literal"><span class="pre">uid</span></tt> or <tt class="docutils literal"><span class="pre">samaccountname</span></tt> will be automatically detected by ownCloud.</p>
 +</div>
 +<div class="section" id="ldap-email-address">
 +<h5>LDAP Email Address<a class="headerlink" href="#ldap-email-address" title="Permalink to this headline">¶</a></h5>
 +<p>If checked, the login credentials will be compared to an email address in the LDAP directory.
 +ownCloud will exmaine the <tt class="docutils literal"><span class="pre">mailPrimaryAddress</span></tt> and <tt class="docutils literal"><span class="pre">mail</span></tt> attributes in the LDAP for the email address.</p>
 +</div>
 +<div class="section" id="other-attributes">
 +<h5>Other attributes<a class="headerlink" href="#other-attributes" title="Permalink to this headline">¶</a></h5>
 +<p>This field allows the admin to select additional attributes for comparison.
 +The list is generated automatically based on the attributes contained in the user object of the LDAP server.</p>
 +</div>
 +<div class="section" id="enter-raw-filter-instead">
 +<h5>Enter raw filter instead<a class="headerlink" href="#enter-raw-filter-instead" title="Permalink to this headline">¶</a></h5>
 +<p>Selecting this text will toggle the filter mode.
 +Instead of the wizard’s assistance, the admin may enter the raw LDAP filter in this field.</p>
 +<p>The <tt class="docutils literal"><span class="pre">%uid</span></tt> placeholder will be replaced with the login name entered by the user upon login.</p>
 +<p>Examples:</p>
 +<ul>
 +<li><p class="first">Username only:</p>
 +<div class="highlight-python"><pre>uid=%iud</pre>
 +</div>
 +</li>
 +<li><p class="first">Username or email address:</p>
 +<div class="highlight-python"><pre>(|(uid=%uid)(mail=%uid))</pre>
 +</div>
 +</li>
 +</ul>
 +<p><img alt="10000000000004170000016ACB5E15AE_png" src="../../_images/10000000000004170000016ACB5E15AE.png" style="width: 6.5in; height: 2.2465in;" /></p>
 +</div>
 +</div>
 +<div class="section" id="group-filter">
 +<h4>Group Filter<a class="headerlink" href="#group-filter" title="Permalink to this headline">¶</a></h4>
 +<p>The settings in this tab determine which groups will be available in ownCloud.
 +This tab does not restrict logins in any manner as that was handled in the prior tabs.
 +It is possible to enter a raw LDAP filter as well.</p>
 +<p>By default, there are no groups available in ownCloud.
 +The admin must enable this manually.</p>
 +<div class="section" id="id1">
 +<h5>Only those object classes<a class="headerlink" href="#id1" title="Permalink to this headline">¶</a></h5>
 +<p>ownCloud will automatically determine which object classes are available in the LDAP.
 +ownCloud will only list object classes that return at least one group object.
 +It is possible to enter multiple object classes.</p>
 +</div>
 +<div class="section" id="id2">
 +<h5>Only from those groups<a class="headerlink" href="#id2" title="Permalink to this headline">¶</a></h5>
 +<p>This setting allows the admin to select which groups are available within ownCloud.
 +ownCloud will generate a list of available groups found in the LDAP server for the admin to select.
 +It is possible to enter multiple groups.</p>
 +</div>
 +<div class="section" id="id3">
 +<h5>Edit raw filter instead<a class="headerlink" href="#id3" title="Permalink to this headline">¶</a></h5>
 +<p>Selecting this text will toggle the filter mode.
 +Instead of the wizard’s assistance, the admin may enter the raw LDAP filter in this field</p>
 +</div>
 +<div class="section" id="y-groups-found">
 +<h5>Y groups found<a class="headerlink" href="#y-groups-found" title="Permalink to this headline">¶</a></h5>
 +<p>Indicates the approximate number of groups available in ownCloud.
 +This number will update after any changes made to the LDAP configuration.</p>
 +<p><img alt="100000000000043000000164DA0CE8C9_png" src="../../_images/100000000000043000000164DA0CE8C9.png" style="width: 6.5in; height: 2.1583in;" /></p>
 +</div>
 +</div>
 +<div class="section" id="advanced-tab">
 +<h4>Advanced Tab<a class="headerlink" href="#advanced-tab" title="Permalink to this headline">¶</a></h4>
 +<p>The LDAP Advanced settings section allows the admin to define less common
 +options.  These options are not required for a working connection however, they
 +can have a positive effect on the performance.</p>
 +<p>The Advanced Settings tab has three sections</p>
 +<ul class="simple">
 +<li>Connection settings</li>
 +<li>Directory settings</li>
 +<li>Special attributes</li>
 +</ul>
 +<div class="section" id="connection-settings">
 +<h5>Connection Settings<a class="headerlink" href="#connection-settings" title="Permalink to this headline">¶</a></h5>
 +<div class="section" id="configuration-active">
 +<h6>Configuration Active<a class="headerlink" href="#configuration-active" title="Permalink to this headline">¶</a></h6>
 +<p>Allows the admin to enable or disable the current configuration.
 +A disabled configuration will not connect to the LDAP server.</p>
 +<p>By default, this is disabled.
 +It is enabled automatically, when using the wizard and configuration is valid and tests successfully.</p>
 +</div>
 +<div class="section" id="backup-replica-host">
 +<h6>Backup (Replica) Host<a class="headerlink" href="#backup-replica-host" title="Permalink to this headline">¶</a></h6>
 +<p>This is used to define a backup LDAP server.  ownCloud automatically attempts
 +to connect to the backup server when the primary server cannot be accessed.  It
 +is important that the backup server is an exact replica of the primary server
 +as all the object UUIDs must match.</p>
 +</div>
 +<div class="section" id="backup-replica-port">
 +<h6>Backup (Replica) Port<a class="headerlink" href="#backup-replica-port" title="Permalink to this headline">¶</a></h6>
 +<p>This identifies the port on which ownCloud will connect to the backup LDAP server.
 +If no port is provided, ownCloud will utilize the same port as the primary LDAP server.</p>
 +</div>
 +<div class="section" id="disable-main-server">
 +<h6>Disable Main Server<a class="headerlink" href="#disable-main-server" title="Permalink to this headline">¶</a></h6>
 +<p>This is used to disable the primary LDAP server so ownCloud will connect only to the backup server.
 +This can be useful for planned maintenance on the primary server.</p>
 +</div>
 +<div class="section" id="case-insensitive-ldap-server-windows">
 +<h6>Case insensitive LDAP server (Windows)<a class="headerlink" href="#case-insensitive-ldap-server-windows" title="Permalink to this headline">¶</a></h6>
 +<p>Check this if the LDAP server is running on a windows host.
 +Not usually necessary.</p>
 +</div>
 +<div class="section" id="turn-off-ssl-certificate-validation">
 +<h6>Turn off SSL certificate validation<a class="headerlink" href="#turn-off-ssl-certificate-validation" title="Permalink to this headline">¶</a></h6>
 +<p>Disables the check for a valid SSL certificate.
 +It is recommended to use for testing only if needed, but not use in production.</p>
 +</div>
 +<div class="section" id="cache-time-to-live">
 +<h6>Cache Time-To-Live<a class="headerlink" href="#cache-time-to-live" title="Permalink to this headline">¶</a></h6>
 +<p>ownCloud caches the information it receives from the LDAP server.  This is
 +necessary as the ownCloud server attempts to validate the user with every page
 +request or WebDAV interaction.  This time is in seconds.</p>
 +<p>Note if it is required to have the most up-to-date information from the LDAP,
 +it is recommended not to turn off the cache totally, however, to define a
 +lifetime of a small duration (15 seconds)</p>
 +<p><img alt="100000000000042E000001D3EEB9978B_png" src="../../_images/100000000000042E000001D3EEB9978B.png" style="width: 6.5in; height: 2.8366in;" /></p>
 +</div>
 +</div>
 +<div class="section" id="directory-settings">
 +<h5>Directory Settings<a class="headerlink" href="#directory-settings" title="Permalink to this headline">¶</a></h5>
 +<div class="section" id="user-display-name-field">
 +<h6>User Display Name Field<a class="headerlink" href="#user-display-name-field" title="Permalink to this headline">¶</a></h6>
 +<p>The attribute that should be used as display name in ownCloud.</p>
 +</div>
 +<div class="section" id="base-user-tree">
 +<h6>Base User Tree<a class="headerlink" href="#base-user-tree" title="Permalink to this headline">¶</a></h6>
 +<p>The Base DN of LDAP, from where all users can be reached.
 +It needs to be given completely despite to the Base DN from the Basic Settings.
 +You can specify multiple base trees, one in each line.</p>
 +</div>
 +<div class="section" id="user-search-attributes">
 +<h6>User Search Attributes<a class="headerlink" href="#user-search-attributes" title="Permalink to this headline">¶</a></h6>
 +<p>These attributes are used when a search for users with a search string is done.
 +This happens in the share dialogue.
 +By default the user display name attribute as specified above is used.
 +Multiple attributes can be given, one in each line.</p>
 +<p>Note: if an attribute is not available for a given user object, the user will neither be listed nor able to login.</p>
 +</div>
 +<div class="section" id="group-display-name-field">
 +<h6>Group Display Name Field<a class="headerlink" href="#group-display-name-field" title="Permalink to this headline">¶</a></h6>
 +<p>The attribute that should be used as an ownCloud group name.
 +ownCloud allows a limited set of characters (regex notation):</p>
 +<div class="highlight-python"><pre>[a-zA_Z0-9,-_@]</pre>
 +</div>
 +<p>Every other character will be replaced in ownCloud.
 +Once a group bane is assigned, it will not be changed.</p>
 +</div>
 +<div class="section" id="base-group-tree">
 +<h6>Base Group Tree<a class="headerlink" href="#base-group-tree" title="Permalink to this headline">¶</a></h6>
 +<p>The base DN of LDAP from where all groups can be reached.
 +It needs to be given completely despite to the Base DN from the Basic Settings.
 +You can specify multiple base trees, one in each line.</p>
 +</div>
 +<div class="section" id="group-search-attributes">
 +<h6>Group Search Attributes<a class="headerlink" href="#group-search-attributes" title="Permalink to this headline">¶</a></h6>
 +<p>These attributes are used when a search for groups with a search string is done.
 +This happens in the share dialogue for instance.
 +By default the group display name attribute as specified above is being used.
 +Multiple attributes can be given, one in each line.</p>
 +</div>
 +<div class="section" id="group-member-association">
 +<h6>Group Member association<a class="headerlink" href="#group-member-association" title="Permalink to this headline">¶</a></h6>
 +<p>The attribute that is used to indicate group memberships.</p>
 +<p><img alt="10000201000005F90000029D8BA200FB_png" src="../../_images/10000201000005F90000029D8BA200FB.png" /></p>
 +</div>
 +</div>
 +<div class="section" id="special-attributes">
 +<h5>Special Attributes<a class="headerlink" href="#special-attributes" title="Permalink to this headline">¶</a></h5>
 +<div class="section" id="quota-field">
 +<h6>Quota Field<a class="headerlink" href="#quota-field" title="Permalink to this headline">¶</a></h6>
 +<p>This field is used to set a LDAP attribute to define the user quota.
 +The attribute should retain a readable value, for example:</p>
 +<div class="highlight-python"><pre>2 GB</pre>
 +</div>
 +</div>
 +<div class="section" id="quota-default">
 +<h6>Quota Default<a class="headerlink" href="#quota-default" title="Permalink to this headline">¶</a></h6>
 +<p>This is used to override the ownCloud default quota for LDAP users who do not have an attribute set in the above parameter.</p>
 +<p>Example:</p>
 +<div class="highlight-python"><pre>15GB</pre>
 +</div>
 +</div>
 +<div class="section" id="email-field">
 +<h6>Email Field<a class="headerlink" href="#email-field" title="Permalink to this headline">¶</a></h6>
 +<p>ownCloud will read the attribute configured here and configure the user’s email.</p>
 +</div>
 +<div class="section" id="user-home-folder-naming-rule">
 +<h6>User Home Folder Naming Rule<a class="headerlink" href="#user-home-folder-naming-rule" title="Permalink to this headline">¶</a></h6>
 +<p>By default, ownCloud creates a user directory which contains all files and meta data based on the ownCloud user name.
 +To override this setting and name it after a different attribute, configure that attribute here.
 +The attribute can also return an absolute path (such as <tt class="docutils literal"><span class="pre">/mnt/storage43/alice</span></tt>).</p>
 +<p><img alt="100000000000041D0000017D8D1BC4D9_png" src="../../_images/100000000000041D0000017D8D1BC4D9.png" style="width: 6.5in; height: 2.352in;" /></p>
 +</div>
 +</div>
 +</div>
 +</div>
 +<div class="section" id="expert-tab">
 +<h3>Expert Tab<a class="headerlink" href="#expert-tab" title="Permalink to this headline">¶</a></h3>
 +<div class="section" id="internal-username">
 +<h4>Internal Username<a class="headerlink" href="#internal-username" title="Permalink to this headline">¶</a></h4>
 +<p>The internal username is the identifier in ownCloud for LDAP users.
 +By default it will be created from the UUID attribute.  By using the UUID
 +attribute it is made sure that the username is unique and characters do not
 +need to be converted.  The internal username has the restriction that only
 +these characters are allowed (regex notation):</p>
 +<div class="highlight-python"><pre>[a-zA-Z0-0_. at -]</pre>
 +</div>
 +<p>Other characters are replaced with their ASCII correspondence or are simply
 +omitted</p>
 +<p>The LDAP backend ensures that there are no duplicate internal usernames in
 +ownCloud, i.e. that it is checking all other activated user back ends
 +(including local ownCloud users). On collisions a random number (between 1000
 +and 9999) will be attached to the retrieved value. For example, if <tt class="docutils literal"><span class="pre">alice</span></tt>
 +exists, the next username may be <tt class="docutils literal"><span class="pre">alice_1337</span></tt>.</p>
 +<p>The internal username is also the default name for the user home folder in
 +ownCloud. It is also a part of remote URLs, for instance for all *DAV
 +services. With this setting the default behavior can be overridden.</p>
 +<p>Leave it empty for default behavior. Changes will have effect only on newly
 +mapped (added) LDAP users.</p>
 +</div>
 +<div class="section" id="override-uuid-detection">
 +<h4>Override UUID detection<a class="headerlink" href="#override-uuid-detection" title="Permalink to this headline">¶</a></h4>
 +<p>By default ownCloud auto-detects the UUID attribute.
 +The UUID attribute is used to doubtlessly identify LDAP users and groups.
 +Also, the internal username will be created based on the UUID, if not specified from above.</p>
 +<p>You can override the setting and pass an attribute of your choice. You must
 +make sure that the attribute of your choice can be fetched for both users and
 +groups and it is unique. Leave it empty for default behavior. Changes will have
 +effect only on newly mapped (added) LDAP users and groups. It also will have
 +effect when a user’s or group’s DN changes and an old UUID was cached: It will
 +result in a new user.</p>
 +<p>Because of this, the setting should be applied before putting ownCloud in
 +production use and cleaning the bindings (see below).</p>
 +</div>
 +<div class="section" id="username-ldap-user-mapping">
 +<h4>Username-LDAP User Mapping<a class="headerlink" href="#username-ldap-user-mapping" title="Permalink to this headline">¶</a></h4>
 +<p>ownCloud uses the usernames as key to store and assign data.  In order to
 +precisely identify and recognize users, each LDAP user will have an internal
 +username in ownCloud.  This requires a mapping from ownCloud username to LDAP
 +user.  The created username is mapped to the UUID of the LDAP user.
 +Additionally the DN is cached as well to reduce LDAP interaction, but is not
 +used for identification.  If the DN changes, the change will be detected by
 +ownCloud by checking the UUID value.</p>
 +<p>The same is valid for groups.</p>
 +<p>The internal ownCloud name is used all over in ownCloud.
 +Clearing the mappings will have leftovers everywhere.
 +Never clear the mappings in a production environment.
 +Only clear mappings in a test or experimental stage.</p>
 +<p><img alt="10000000000003FB000002359BAFB40E_png" src="../../_images/10000000000003FB000002359BAFB40E.png" style="width: 6.5in; height: 3.6043in;" /></p>
 +</div>
 +</div>
 +</div>
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/apps/viewers/index.html
index 7f8d00c,0000000..b56f3e2
mode 100644,000000..100644
--- a/core/doc/admin/apps/viewers/index.html
+++ b/core/doc/admin/apps/viewers/index.html
@@@ -1,190 -1,0 +1,193 @@@
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>File Viewers — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="../../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../../_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="../../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../../_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '../../',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="../../_static/jquery.js"></script>
 +    <script type="text/javascript" src="../../_static/underscore.js"></script>
 +    <script type="text/javascript" src="../../_static/doctools.js"></script>
 +    <script type="text/javascript" src="../../_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../../index.html" />
 +    <link rel="up" title="Apps" href="../index.html" />
 +    <link rel="next" title="Maintenance" href="../../maintenance/index.html" />
 +    <link rel="prev" title="LDAP user and group backend" href="../user_ldap/index.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="../../contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="../../contents.html">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="../../index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
 +<ul class="current">
 +<li class="toctree-l1"><a class="reference internal" href="../../installation/index.html">Installation</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../../configuration/index.html">Configuration</a></li>
 +<li class="toctree-l1 current"><a class="reference internal" href="../index.html">Apps</a><ul class="current">
 +<li class="toctree-l2"><a class="reference internal" href="../activity/index.html">Activity</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../admin_dependencies_chk/index.html">Finding Deployment Dependencies</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../files_antivirus/index.html">File Antivirus Engine</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../files_encryption/index.html">Encryption</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../files_external/index.html">External storage support</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../files_sharing/index.html">Sharing</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../files_trashbin/index.html">Deleted Files</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../files_versions/index.html">Versions</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../firstrunwizard/index.html">First Run Wizard</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="../user_ldap/index.html">LDAP user and group backend</a></li>
 +<li class="toctree-l2 current"><a class="current reference internal" href="">File Viewers</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="#configuration">Configuration</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="#utilization">Utilization</a></li>
 +</ul>
 +</li>
 +</ul>
 +</li>
 +<li class="toctree-l1"><a class="reference internal" href="../../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../sharing_api/index.html">Sharing API</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../../config/index.html">The Configuration File</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../../issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <div class="section" id="file-viewers">
 +<h1>File Viewers<a class="headerlink" href="#file-viewers" title="Permalink to this headline">¶</a></h1>
 +<p>ownCloud provides apps which allow users to view/edit
 +text files and view images which exist on the ownCloud server.</p>
 +<div class="section" id="configuration">
 +<h2>Configuration<a class="headerlink" href="#configuration" title="Permalink to this headline">¶</a></h2>
 +<div class="section" id="text-editor">
 +<h3>Text Editor<a class="headerlink" href="#text-editor" title="Permalink to this headline">¶</a></h3>
 +<p>The Text Editor App allows users to view and edit text files.
 +To enable this app, navigate to the Apps page and select “Text Editor” then Enable.</p>
 +<p><img alt="100000000000012C0000009C444B4720_png" src="../../_images/100000000000012C0000009C444B4720.png" style="width: 3.1252in; height: 1.6252in;" /></p>
 +</div>
 +<div class="section" id="image-viewer">
 +<h3>Image Viewer<a class="headerlink" href="#image-viewer" title="Permalink to this headline">¶</a></h3>
 +<p>The image viewer app allows users to preview image files within the ownCloud web interface.
 +To enable, navigate to the Apps page and select “Image Viewer” then enable.</p>
 +<p><img alt="10000000000001400000008A557EF7E3_png" src="../../_images/10000000000001400000008A557EF7E3.png" style="width: 3.3335in; height: 1.4374in;" /></p>
 +</div>
 +</div>
 +<div class="section" id="utilization">
 +<h2>Utilization<a class="headerlink" href="#utilization" title="Permalink to this headline">¶</a></h2>
 +<p>When the apps are enabled, select the file name on the web interface Files tab and either the text editor or the image will appear.</p>
 +<p><img alt="10000000000001E50000006E3ECDC427_png" src="../../_images/10000000000001E50000006E3ECDC427.png" style="width: 5.052in; height: 1.1457in;" /></p>
 +<p><img alt="100000000000044C000002B0B421E27E_png" src="../../_images/100000000000044C000002B0B421E27E.png" style="width: 6.5in; height: 4.0654in;" /></p>
 +<p>When the apps are disabled, selecting the file name on the web interface will prompt the user to download the specified file.</p>
 +</div>
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/config/apps.html
index 653fbad,0000000..eafcc82
mode 100644,000000..100644
--- a/core/doc/admin/config/apps.html
+++ b/core/doc/admin/config/apps.html
@@@ -1,212 -1,0 +1,215 @@@
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>APPS — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '../',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="../_static/jquery.js"></script>
 +    <script type="text/javascript" src="../_static/underscore.js"></script>
 +    <script type="text/javascript" src="../_static/doctools.js"></script>
 +    <script type="text/javascript" src="../_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
 +    <link rel="up" title="The Configuration File" href="index.html" />
 +    <link rel="next" title="Previews" href="previews.html" />
 +    <link rel="prev" title="Code Locations" href="code_locations.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="../contents.html">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
 +<ul class="current">
 +<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../apps/index.html">Apps</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../sharing_api/index.html">Sharing API</a></li>
 +<li class="toctree-l1 current"><a class="reference internal" href="index.html">The Configuration File</a><ul class="current">
 +<li class="toctree-l2"><a class="reference internal" href="default_parameters.html">Default Parameters</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="reverse_proxy_configurations.html">Reverse Proxy Configurations</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="user_experience.html">User Experience</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="mail_parameters.html">Mail Parameters</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="deleted_items.html">Deleted Items</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="verification.html">Verification</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="logging.html">Logging</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="session_info.html">Session Info</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="code_locations.html">Code Locations</a></li>
 +<li class="toctree-l2 current"><a class="current reference internal" href="">APPS</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="previews.html">Previews</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="maintenance.html">Maintenance</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="miscellaneous.html">Miscellaneous</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <div class="section" id="apps">
 +<h1>APPS<a class="headerlink" href="#apps" title="Permalink to this headline">¶</a></h1>
 +<p>The following parameters are used for ownCloud apps.</p>
 +<table border="1" class="docutils">
 +<colgroup>
 +<col width="10%" />
 +<col width="23%" />
 +<col width="67%" />
 +</colgroup>
 +<tbody valign="top">
 +<tr class="row-odd"><td><strong>Parameter</strong></td>
 +<td><strong>Format</strong></td>
 +<td><strong>Description</strong></td>
 +</tr>
 +<tr class="row-even"><td><strong>Apps Paths</strong></td>
 +<td><p class="first">“apps_paths” => array(</p>
 +<p>0 => array(</p>
 +<p>‘path’=> ‘/var/www/owncloud/apps’,</p>
 +<p>‘url’ => ‘/apps’,</p>
 +<p>‘writable’ => true,</p>
 +<p>),</p>
 +<p>1 => array (</p>
 +<p>‘path’ =>
 +‘/var/www/owncloud/apps2’,</p>
 +<p>‘url’ => ‘/apps2’,</p>
 +<p>Writable => false,</p>
 +<p>),</p>
 +<p class="last">),</p>
 +</td>
 +<td>Use this parameter to set the location of the apps folder which should be scanned for available apps and/or where user specific apps should be installed.
 +The path defines the absolute file system path to the app folder.
 +The key url defines the http web path to that folder starting at the owncloud web root.
 +The key writable indicates if a user can install apps in that folder.</td>
 +</tr>
 +<tr class="row-odd"><td><strong>App Store Enabled</strong></td>
 +<td>“appstoreenabled” => true,</td>
 +<td>When enabled, admins may install apps from the ownCloud app store.</td>
 +</tr>
 +<tr class="row-even"><td><strong>App Store URL</strong></td>
 +<td>“appstoreurl” => “<a class="reference external" href="http://api.apps.owncloud.com/v1">http://api.apps.owncloud.com/v1</a>”,</td>
 +<td>The URL of the appstore.</td>
 +</tr>
 +<tr class="row-odd"><td><strong>App Code Checker</strong></td>
 +<td>“appcodechecker” => “”,</td>
 +<td>Checks for malicious code fragments of 3
 +rd
 +party apps.</td>
 +</tr>
 +</tbody>
 +</table>
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/config/code_locations.html
index 1370ee6,0000000..80a4389
mode 100644,000000..100644
--- a/core/doc/admin/config/code_locations.html
+++ b/core/doc/admin/config/code_locations.html
@@@ -1,211 -1,0 +1,214 @@@
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>Code Locations — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '../',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="../_static/jquery.js"></script>
 +    <script type="text/javascript" src="../_static/underscore.js"></script>
 +    <script type="text/javascript" src="../_static/doctools.js"></script>
 +    <script type="text/javascript" src="../_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
 +    <link rel="up" title="The Configuration File" href="index.html" />
 +    <link rel="next" title="APPS" href="apps.html" />
 +    <link rel="prev" title="Session Info" href="session_info.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="../contents.html">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
 +<ul class="current">
 +<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../apps/index.html">Apps</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../sharing_api/index.html">Sharing API</a></li>
 +<li class="toctree-l1 current"><a class="reference internal" href="index.html">The Configuration File</a><ul class="current">
 +<li class="toctree-l2"><a class="reference internal" href="default_parameters.html">Default Parameters</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="reverse_proxy_configurations.html">Reverse Proxy Configurations</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="user_experience.html">User Experience</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="mail_parameters.html">Mail Parameters</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="deleted_items.html">Deleted Items</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="verification.html">Verification</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="logging.html">Logging</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="session_info.html">Session Info</a></li>
 +<li class="toctree-l2 current"><a class="current reference internal" href="">Code Locations</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="apps.html">APPS</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="previews.html">Previews</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="maintenance.html">Maintenance</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="miscellaneous.html">Miscellaneous</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <div class="section" id="code-locations">
 +<h1>Code Locations<a class="headerlink" href="#code-locations" title="Permalink to this headline">¶</a></h1>
 +<p>ownCloud has the ability to find parts of its code in non-standard locations.
 +This section describes how to configure ownCloud for that functionality.</p>
 +<table border="1" class="docutils">
 +<colgroup>
 +<col width="7%" />
 +<col width="34%" />
 +<col width="59%" />
 +</colgroup>
 +<tbody valign="top">
 +<tr class="row-odd"><td><strong>Parameter</strong></td>
 +<td><strong>Format</strong></td>
 +<td><strong>Description</strong></td>
 +</tr>
 +<tr class="row-even"><td><strong>Theme</strong></td>
 +<td>“theme” => “”,</td>
 +<td>If the instance of ownCloud is themed, the name of the theme should be configured here.
 +For more information on this parameter, see the document on Theming.</td>
 +</tr>
 +<tr class="row-odd"><td><strong>3</strong>
 +rd
 +** Party Root**</td>
 +<td>“3rdpartyroot” => “”,</td>
 +<td>ownCloud uses some 3
 +rd
 +party PHP components to provide certain functionality.
 +These components are shipped as part of the software package and reside in
 +~/owncloud/3rdparty.
 +However, if this folder resides elsewhere, the location can be configured here.
 +For example /srv/http/path/to/3rdparty.</td>
 +</tr>
 +<tr class="row-even"><td><strong>3</strong>
 +rd
 +** Party URL**</td>
 +<td>“3rdpartyurl” => “”,</td>
 +<td>In the event that the 3rdpartyroot is configured, this parameter should be configured as well to show the http web path to the 3rdpartyroot starting at the owncloud web root.
 +For instance /path/to/3rdparty.</td>
 +</tr>
 +<tr class="row-odd"><td><strong>Custome Client</strong></td>
 +<td><p class="first">‘customclient_desktop’ => ‘’, //<a class="reference external" href="http://owncloud.org/sync-clients/">http://owncloud.org/sync-clients/</a></p>
 +<p>‘customclient_android’ => ‘’, //<a class="reference external" href="https://play.google.com/store/apps/details?id=com.owncloud.android">https://play.google.com/store/apps/details?id=com.owncloud.android</a></p>
 +<p class="last">‘customclient_ios’ => ‘’, //<a class="reference external" href="https://itunes.apple.com/us/app/owncloud/id543672169?mt=8">https://itunes.apple.com/us/app/owncloud/id543672169?mt=8</a></p>
 +</td>
 +<td>The location where ownCloud will bring the user to download clients.
 +The link is in the first run wizard or the Personal page.</td>
 +</tr>
 +</tbody>
 +</table>
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/config/default_parameters.html
index e841938,0000000..ad99164
mode 100644,000000..100644
--- a/core/doc/admin/config/default_parameters.html
+++ b/core/doc/admin/config/default_parameters.html
@@@ -1,251 -1,0 +1,254 @@@
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>Default Parameters — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '../',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="../_static/jquery.js"></script>
 +    <script type="text/javascript" src="../_static/underscore.js"></script>
 +    <script type="text/javascript" src="../_static/doctools.js"></script>
 +    <script type="text/javascript" src="../_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
 +    <link rel="up" title="The Configuration File" href="index.html" />
 +    <link rel="next" title="Reverse Proxy Configurations" href="reverse_proxy_configurations.html" />
 +    <link rel="prev" title="The Configuration File" href="index.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="../contents.html">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
 +<ul class="current">
 +<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../apps/index.html">Apps</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../sharing_api/index.html">Sharing API</a></li>
 +<li class="toctree-l1 current"><a class="reference internal" href="index.html">The Configuration File</a><ul class="current">
 +<li class="toctree-l2 current"><a class="current reference internal" href="">Default Parameters</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="reverse_proxy_configurations.html">Reverse Proxy Configurations</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="user_experience.html">User Experience</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="mail_parameters.html">Mail Parameters</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="deleted_items.html">Deleted Items</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="verification.html">Verification</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="logging.html">Logging</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="session_info.html">Session Info</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="code_locations.html">Code Locations</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="apps.html">APPS</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="previews.html">Previews</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="maintenance.html">Maintenance</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="miscellaneous.html">Miscellaneous</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <div class="section" id="default-parameters">
 +<h1>Default Parameters<a class="headerlink" href="#default-parameters" title="Permalink to this headline">¶</a></h1>
 +<p>The following parameters are automatically configured by ownCloud upon the initial admin login.
 +These parameters are mandatory for the ownCloud instance to operate properly.</p>
 +<table border="1" class="docutils">
 +<colgroup>
 +<col width="9%" />
 +<col width="12%" />
 +<col width="79%" />
 +</colgroup>
 +<tbody valign="top">
 +<tr class="row-odd"><td><strong>Parameter</strong></td>
 +<td><strong>Format</strong></td>
 +<td><strong>Description</strong></td>
 +</tr>
 +<tr class="row-even"><td><strong>Debug</strong></td>
 +<td>define(“DEBUG”, true);</td>
 +<td>When set to true, additional information is written to the logs.
 +This is to be used only for local development and not in a production environment.</td>
 +</tr>
 +<tr class="row-odd"><td><strong>Installed</strong></td>
 +<td>“installed” => false,</td>
 +<td>This flag indicates whether the ownCloud instance was installed successfully.
 +When set to true, the install was successful.
 +When set to false the instance is not properly installed.</td>
 +</tr>
 +<tr class="row-even"><td><strong>DB Type</strong></td>
 +<td>“dbtype” => “sqlite”,</td>
 +<td>The dbtype indicates what type of database is being used with this install.</td>
 +</tr>
 +<tr class="row-odd"><td><strong>DB Name</strong></td>
 +<td>“dbname” => “owncloud”,</td>
 +<td>The ownCloud database within the SQL instance.
 +ownCloud database configuration guides use “owncloud” in the instructions, it is the default for this field.
 +This may be set to any valid table name.
- If the table doesn’t exist, the setup will attempt to create it, provided it has proper permissions.</td>
++If the table does not exist, the setup will attempt to create it, provided it has proper permissions.</td>
 +</tr>
 +<tr class="row-even"><td><strong>DB User</strong></td>
 +<td>“dbuser” => “”,</td>
- <td>This is the user that ownCloud uses to write to the databse.
++<td>This is the user that ownCloud uses to write to the database.
 +This must be unique across ownCloud instances using the same SQL database.
 +The user will be created when the install wizard is complete.
 +Since the database user in the initial login screen has admin privileges (root), ownCloud creates a new user to ensure ownCloud does not run with unnecessary database permissions.
- ownCloud prefixes “<a href="#id1"><span class="problematic" id="id2">oc_</span></a>” to the userid to prevent a collision between the ownCloud admin user and any existing database users.
++ownCloud prefixes “oc_” to the userid to prevent a collision between the ownCloud admin user and any existing database users.
 +This is generated at the time of the initial login and is the Admin User as entered by the ownCloud admin.</td>
 +</tr>
 +<tr class="row-odd"><td><strong>DB Password</strong></td>
 +<td>“dbpassword” => “”,</td>
 +<td>When a new database user is created for ownCloud, a password for the database is generated by hashing the admin user password.
 +This hash is stored in this parameter.</td>
 +</tr>
 +<tr class="row-even"><td><strong>DB Host</strong></td>
 +<td>“dbhost” => “”,</td>
 +<td>This parameter shows the location of the database.
 +Can be an IP pointing to the database server, a Fully Qualified Domain Name (FQDN) or localhost.</td>
 +</tr>
 +<tr class="row-odd"><td><strong>DB Table Prefix</strong></td>
- <td>“dbtableprefix” => “<a href="#id3"><span class="problematic" id="id4">oc_</span></a>”,</td>
++<td>“dbtableprefix” => “oc_”,</td>
 +<td>All tables in the database will begin with this prefix.
- By default the prefix is “<a href="#id5"><span class="problematic" id="id6">oc_</span></a>”.
++By default the prefix is “oc_”.
 +If this prefix is changed in the config file, the tables in the database will need to be manually renamed.
 +ownCloud will not detect a change to this option so changing this prefix without manually renaming the tables will break the instance of ownCloud.</td>
 +</tr>
 +<tr class="row-even"><td><strong>Password Salt</strong></td>
 +<td>“passwordsalt” => “”,</td>
 +<td>This is the salt used to hash passwords within the ownCloud instance.
 +It is important not to remove or lose this password.
 +If lost, all passwords within the ownCloud instance will be lost.</td>
 +</tr>
 +<tr class="row-odd"><td><strong>Data Directory</strong></td>
 +<td>“datadirectory” => “”,</td>
 +<td>This parameter tells ownCloud where the default data directory is located.
 +It is configured in the installation wizard.
 +If using SQLITE, the database is stored in this data directory as well.</td>
 +</tr>
 +<tr class="row-even"><td><strong>Trusted Domains</strong></td>
 +<td><p class="first">  ‘trusted_domains’ =></p>
 +<p>  array (</p>
 +<p>    0 => ‘A.B.C.D
 +‘,</p>
 +<p class="last">  ),</p>
 +</td>
 +<td>This parameter identifies trusted URL for ownCloud which users may log into.
 +The initial entry ‘0’ is automatic.
 +If it is desired to have additional entries, these may be added manually.
 +This is used to mitigate Header Post Poisoning attacks.</td>
 +</tr>
 +</tbody>
 +</table>
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/config/deleted_items.html
index 26521fc,0000000..25ea150
mode 100644,000000..100644
--- a/core/doc/admin/config/deleted_items.html
+++ b/core/doc/admin/config/deleted_items.html
@@@ -1,187 -1,0 +1,190 @@@
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>Deleted Items — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '../',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="../_static/jquery.js"></script>
 +    <script type="text/javascript" src="../_static/underscore.js"></script>
 +    <script type="text/javascript" src="../_static/doctools.js"></script>
 +    <script type="text/javascript" src="../_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
 +    <link rel="up" title="The Configuration File" href="index.html" />
 +    <link rel="next" title="Verification" href="verification.html" />
 +    <link rel="prev" title="Mail Parameters" href="mail_parameters.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="../contents.html">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
 +<ul class="current">
 +<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../apps/index.html">Apps</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../sharing_api/index.html">Sharing API</a></li>
 +<li class="toctree-l1 current"><a class="reference internal" href="index.html">The Configuration File</a><ul class="current">
 +<li class="toctree-l2"><a class="reference internal" href="default_parameters.html">Default Parameters</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="reverse_proxy_configurations.html">Reverse Proxy Configurations</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="user_experience.html">User Experience</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="mail_parameters.html">Mail Parameters</a></li>
 +<li class="toctree-l2 current"><a class="current reference internal" href="">Deleted Items</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="verification.html">Verification</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="logging.html">Logging</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="session_info.html">Session Info</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="code_locations.html">Code Locations</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="apps.html">APPS</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="previews.html">Previews</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="maintenance.html">Maintenance</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="miscellaneous.html">Miscellaneous</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <div class="section" id="deleted-items">
 +<h1>Deleted Items<a class="headerlink" href="#deleted-items" title="Permalink to this headline">¶</a></h1>
 +<p>These parameters are related to the deleted files app.</p>
 +<table border="1" class="docutils">
 +<colgroup>
 +<col width="15%" />
 +<col width="23%" />
 +<col width="62%" />
 +</colgroup>
 +<tbody valign="top">
 +<tr class="row-odd"><td><strong>Parameter</strong></td>
 +<td><strong>Format</strong></td>
 +<td><strong>Description</strong></td>
 +</tr>
 +<tr class="row-even"><td><strong>Trash Bin Rentention</strong></td>
 +<td>‘trashbin_retention_obligation’ => 30,</td>
 +<td>When the delete app is enabled (default), this is the amount of days a file will be kept in the trash bin.
 +Default is 30 days.</td>
 +</tr>
 +<tr class="row-odd"><td><strong>Trash Bin Auto Expire</strong></td>
 +<td>‘trashbin_auto_expire’ => true,</td>
 +<td> </td>
 +</tr>
 +</tbody>
 +</table>
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/config/index.html
index df93651,0000000..3efb05a
mode 100644,000000..100644
--- a/core/doc/admin/config/index.html
+++ b/core/doc/admin/config/index.html
@@@ -1,171 -1,0 +1,174 @@@
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>The Configuration File — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '../',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="../_static/jquery.js"></script>
 +    <script type="text/javascript" src="../_static/underscore.js"></script>
 +    <script type="text/javascript" src="../_static/doctools.js"></script>
 +    <script type="text/javascript" src="../_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
 +    <link rel="next" title="Default Parameters" href="default_parameters.html" />
-     <link rel="prev" title="Migrating ownCloud Installations" href="../maintenance/migrating.html" />
++    <link rel="prev" title="Delete Share" href="../sharing_api/delete_share.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="../contents.html">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
 +<ul class="current">
 +<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../apps/index.html">Apps</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../sharing_api/index.html">Sharing API</a></li>
 +<li class="toctree-l1 current"><a class="current reference internal" href="">The Configuration File</a><ul>
 +<li class="toctree-l2"><a class="reference internal" href="default_parameters.html">Default Parameters</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="reverse_proxy_configurations.html">Reverse Proxy Configurations</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="user_experience.html">User Experience</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="mail_parameters.html">Mail Parameters</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="deleted_items.html">Deleted Items</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="verification.html">Verification</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="logging.html">Logging</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="session_info.html">Session Info</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="code_locations.html">Code Locations</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="apps.html">APPS</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="previews.html">Previews</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="maintenance.html">Maintenance</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="miscellaneous.html">Miscellaneous</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <div class="section" id="the-configuration-file">
 +<h1>The Configuration File<a class="headerlink" href="#the-configuration-file" title="Permalink to this headline">¶</a></h1>
 +<div class="toctree-wrapper compound">
 +</div>
 +<p>ownCloud uses a configuration file to set certain parameters.  The
 +configuration file is entitled <cite>config.php</cite> and resides in the <cite>config</cite>
 +directory of the ownCloud installation. Also residing in that directory is a
 +sample configuration file entitled <cite>config.sample.php</cite>.  This file lists all
 +the configurable parameters within ownCloud along with a brief description.
 +This document will provide more details as to what each parameter is used for.</p>
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/config/logging.html
index 1c37616,0000000..fb260b3
mode 100644,000000..100644
--- a/core/doc/admin/config/logging.html
+++ b/core/doc/admin/config/logging.html
@@@ -1,227 -1,0 +1,230 @@@
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>Logging — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '../',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="../_static/jquery.js"></script>
 +    <script type="text/javascript" src="../_static/underscore.js"></script>
 +    <script type="text/javascript" src="../_static/doctools.js"></script>
 +    <script type="text/javascript" src="../_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
 +    <link rel="up" title="The Configuration File" href="index.html" />
 +    <link rel="next" title="Session Info" href="session_info.html" />
 +    <link rel="prev" title="Verification" href="verification.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="../contents.html">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
 +<ul class="current">
 +<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../apps/index.html">Apps</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../sharing_api/index.html">Sharing API</a></li>
 +<li class="toctree-l1 current"><a class="reference internal" href="index.html">The Configuration File</a><ul class="current">
 +<li class="toctree-l2"><a class="reference internal" href="default_parameters.html">Default Parameters</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="reverse_proxy_configurations.html">Reverse Proxy Configurations</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="user_experience.html">User Experience</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="mail_parameters.html">Mail Parameters</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="deleted_items.html">Deleted Items</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="verification.html">Verification</a></li>
 +<li class="toctree-l2 current"><a class="current reference internal" href="">Logging</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="session_info.html">Session Info</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="code_locations.html">Code Locations</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="apps.html">APPS</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="previews.html">Previews</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="maintenance.html">Maintenance</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="miscellaneous.html">Miscellaneous</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <div class="section" id="logging">
 +<h1>Logging<a class="headerlink" href="#logging" title="Permalink to this headline">¶</a></h1>
 +<p>This section describes parameters associated with ownCloud’s logging abilities.</p>
 +<table border="1" class="docutils">
 +<colgroup>
 +<col width="10%" />
 +<col width="25%" />
 +<col width="65%" />
 +</colgroup>
 +<tbody valign="top">
 +<tr class="row-odd"><td><strong>Parameter</strong></td>
 +<td><strong>Format</strong></td>
 +<td><strong>Description</strong></td>
 +</tr>
 +<tr class="row-even"><td><strong>Log Type</strong></td>
 +<td>“log_type” => “owncloud”,</td>
 +<td>By default the ownCloud logs are sent to the owncloud.log file within the default data directory.
 +If syslogging is desired, set this parameter to syslog.</td>
 +</tr>
 +<tr class="row-odd"><td><strong>Log File</strong></td>
 +<td>“logfile” => “”,</td>
 +<td>The log file, by default, is owncloud.log and stored in the default data directory.
 +Use this parameter to change the name to something other than owncloud.log.</td>
 +</tr>
 +<tr class="row-even"><td><strong>Log Level</strong></td>
 +<td>“loglevel” => “”,</td>
 +<td>ownCloud has several levels of logging.
 +This may be set on the Admin page of the webUI or directly in the configuration file using this parameter.
 +Valid values are: 0=Debug, 1=Info, 2=Warning, 3=Error.
 +The default value is Warning</td>
 +</tr>
 +<tr class="row-odd"><td><strong>Log Date Format</strong></td>
 +<td>‘logdateformat’ => ‘F d, Y H:i:s’,</td>
 +<td>ownCloud allows the admin to specify the format of the time and date within the log file.
 +Valid values may be found at the following website:
 +<a class="reference external" href="http://www.php.net/manual/en/function.date.php">http://www.php.net/manual/en/function.date.php</a>
 +.</td>
 +</tr>
 +<tr class="row-even"><td><strong>Log Time Zone</strong></td>
 +<td>‘logtimezone’ => ‘Europe/Berlin’,</td>
 +<td>By default, the time zone displayed in the ownCloud logs is UTC.
 +To change the displayed time zone to the local time zone, use this parameter.
 +For a list of valid values, see the following website:
 +<a class="reference external" href="http://php.net/manual/en/timezones.php">http://php.net/manual/en/timezones.php</a>
 +.</td>
 +</tr>
 +<tr class="row-odd"><td><strong>Log Query</strong></td>
 +<td>“log_query” => false,</td>
 +<td>When set to “true”, all SQL queries performed by ownCloud will be written to the log file.
 +Default is false.
 +It is not recommended to run with this enabled as it will fill up the log file.
 +Use only for debugging purposes.</td>
 +</tr>
 +<tr class="row-even"><td><strong>Log Auth Fail IP</strong></td>
 +<td>“log_authfailip” => false,</td>
 +<td>When set to true, the IP addresses of failed login attempts will be logged.</td>
 +</tr>
 +<tr class="row-odd"><td><strong>Log Rotate Size</strong></td>
 +<td>‘log_rotate_size’ => false, // 104857600, // 100 MiB</td>
 +<td>Since ownCloud log files can get large in size, this parameter may be used to rotate to a new log file once it reaches the specified size.
 +This should be configured in bytes.
 +Default is false, or 0, which will not rotate the file.</td>
 +</tr>
 +</tbody>
 +</table>
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/config/mail_parameters.html
index 8868fa7,0000000..beef7d9
mode 100644,000000..100644
--- a/core/doc/admin/config/mail_parameters.html
+++ b/core/doc/admin/config/mail_parameters.html
@@@ -1,239 -1,0 +1,242 @@@
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>Mail Parameters — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '../',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="../_static/jquery.js"></script>
 +    <script type="text/javascript" src="../_static/underscore.js"></script>
 +    <script type="text/javascript" src="../_static/doctools.js"></script>
 +    <script type="text/javascript" src="../_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
 +    <link rel="up" title="The Configuration File" href="index.html" />
 +    <link rel="next" title="Deleted Items" href="deleted_items.html" />
 +    <link rel="prev" title="User Experience" href="user_experience.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="../contents.html">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
 +<ul class="current">
 +<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../apps/index.html">Apps</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../sharing_api/index.html">Sharing API</a></li>
 +<li class="toctree-l1 current"><a class="reference internal" href="index.html">The Configuration File</a><ul class="current">
 +<li class="toctree-l2"><a class="reference internal" href="default_parameters.html">Default Parameters</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="reverse_proxy_configurations.html">Reverse Proxy Configurations</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="user_experience.html">User Experience</a></li>
 +<li class="toctree-l2 current"><a class="current reference internal" href="">Mail Parameters</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="deleted_items.html">Deleted Items</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="verification.html">Verification</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="logging.html">Logging</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="session_info.html">Session Info</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="code_locations.html">Code Locations</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="apps.html">APPS</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="previews.html">Previews</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="maintenance.html">Maintenance</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="miscellaneous.html">Miscellaneous</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <div class="section" id="mail-parameters">
 +<h1>Mail Parameters<a class="headerlink" href="#mail-parameters" title="Permalink to this headline">¶</a></h1>
 +<p>These parameters are related to ownCloud’s ability to send emails for lost passwords or file shares.</p>
 +<table border="1" class="docutils">
 +<colgroup>
 +<col width="13%" />
 +<col width="19%" />
 +<col width="68%" />
 +</colgroup>
 +<tbody valign="top">
 +<tr class="row-odd"><td><strong>Parameter</strong></td>
 +<td><strong>Format</strong></td>
 +<td><strong>Description</strong></td>
 +</tr>
 +<tr class="row-even"><td><strong>Mail Domain</strong></td>
 +<td>“mail_domain” => “example.com”,</td>
 +<td>The domain to use when ownCloud sends emails.
 +Emails can be sent in such instances as to share a public link, share notification or lost password.</td>
 +</tr>
 +<tr class="row-odd"><td><strong>Mail SMTP Debug</strong></td>
 +<td>“mail_smtpdebug” => false,</td>
 +<td> </td>
 +</tr>
 +<tr class="row-even"><td><strong>Mail SMTP Mode</strong></td>
 +<td>“mail_smtpmode” => “sendmail”,</td>
 +<td><p class="first">The method used to send mail.
 +Valid values are smtp, php, sendmail and qmail.</p>
 +<p>If using local or remote SMTP, set to smtp.</p>
 +<p>If using PHP mail it is necessary to have an installed and working email system on the server.
 +The program used to send email is defined in the PHP.ini file.</p>
 +<p>If using sendmail, it is necessary to have an installed and working email system on the server.
- The sendmail binary is /usr/sbin/sendmail and should be installed on your <a href="#id1"><span class="problematic" id="id2">*</span></a>nix system.</p>
- <p class="last">If using qmail to send email, the binary is /var/qmail/bin/sendmail and should be installed in your <a href="#id3"><span class="problematic" id="id4">*</span></a>nix system.</p>
++The sendmail binary is /usr/sbin/sendmail and should be installed on your Unix system.</p>
++<p class="last">If using qmail to send email, the binary is /var/qmail/bin/sendmail and should be installed in your Unix system.</p>
 +</td>
 +</tr>
 +<tr class="row-odd"><td><strong>Mail SMTP Host</strong></td>
 +<td>“mail_smtphost” => “127.0.0.1”,</td>
 +<td>Mail server host.
 +May contain multiple hosts separated by a semi colon.
 +Also possible is to set the port used a particular host by following the host with a colon then the port number.</td>
 +</tr>
 +<tr class="row-even"><td><strong>Mail SMTP Port</strong></td>
 +<td>“mail_smtpport” => 25,</td>
 +<td>Port used to communicate with the mail server.</td>
 +</tr>
 +<tr class="row-odd"><td><strong>Mail SMTP TIMEOUT</strong></td>
 +<td>“mail_smtptimeout” => 10,</td>
 +<td>In the event that a malware or SPAM scanner is running on the SMTP server, it could be necessary to increase the SMTP timeout.
 +That can be done using this parameter.</td>
 +</tr>
 +<tr class="row-even"><td><strong>Mail SMTP **
 +**Secure</strong></td>
 +<td>“mail_smtpsecure” => “”,</td>
 +<td>Default value is no security.
 +May be ssl or tls depending
 +on the required level of security.</td>
 +</tr>
 +<tr class="row-odd"><td><strong>MAIL SMPT AUTH</strong></td>
 +<td>“mail_smtpauth” => false,</td>
 +<td>Determine if the mail server requires authentication.
 +Default is false.
 +If true, the following parameters should be configured as well.</td>
 +</tr>
 +<tr class="row-even"><td><strong>Mail SMTP Auth Type</strong></td>
 +<td>“mail_smtpauthtype” => “LOGIN”,</td>
 +<td>If SMTP authentication is required, choose the authentication type as login (default) or plain.</td>
 +</tr>
 +<tr class="row-odd"><td><strong>Mail SMTP Name</strong></td>
 +<td>“mail_smtpname” => “username”,</td>
 +<td>The username to use when authentication is enabled.</td>
 +</tr>
 +<tr class="row-even"><td><strong>Mail SMTP Password</strong></td>
 +<td>“mail_smtppassword” => “password”,</td>
 +<td>The password to use when authentication is enabled.</td>
 +</tr>
 +</tbody>
 +</table>
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/config/maintenance.html
index e3d4395,0000000..a6baf26
mode 100644,000000..100644
--- a/core/doc/admin/config/maintenance.html
+++ b/core/doc/admin/config/maintenance.html
@@@ -1,189 -1,0 +1,192 @@@
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>Maintenance — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '../',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="../_static/jquery.js"></script>
 +    <script type="text/javascript" src="../_static/underscore.js"></script>
 +    <script type="text/javascript" src="../_static/doctools.js"></script>
 +    <script type="text/javascript" src="../_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
 +    <link rel="up" title="The Configuration File" href="index.html" />
 +    <link rel="next" title="Miscellaneous" href="miscellaneous.html" />
 +    <link rel="prev" title="Previews" href="previews.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="../contents.html">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
 +<ul class="current">
 +<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../apps/index.html">Apps</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../sharing_api/index.html">Sharing API</a></li>
 +<li class="toctree-l1 current"><a class="reference internal" href="index.html">The Configuration File</a><ul class="current">
 +<li class="toctree-l2"><a class="reference internal" href="default_parameters.html">Default Parameters</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="reverse_proxy_configurations.html">Reverse Proxy Configurations</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="user_experience.html">User Experience</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="mail_parameters.html">Mail Parameters</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="deleted_items.html">Deleted Items</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="verification.html">Verification</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="logging.html">Logging</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="session_info.html">Session Info</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="code_locations.html">Code Locations</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="apps.html">APPS</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="previews.html">Previews</a></li>
 +<li class="toctree-l2 current"><a class="current reference internal" href="">Maintenance</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="miscellaneous.html">Miscellaneous</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <div class="section" id="maintenance">
 +<h1>Maintenance<a class="headerlink" href="#maintenance" title="Permalink to this headline">¶</a></h1>
 +<p>This section discusses the different stages of maintenance.</p>
 +<table border="1" class="docutils">
 +<colgroup>
 +<col width="12%" />
 +<col width="18%" />
 +<col width="70%" />
 +</colgroup>
 +<tbody valign="top">
 +<tr class="row-odd"><td><strong>Parameter</strong></td>
 +<td><strong>Format</strong></td>
 +<td><strong>Description</strong></td>
 +</tr>
 +<tr class="row-even"><td><strong>Single User</strong></td>
 +<td>‘singleuser’ => false,</td>
 +<td>When set to true, the ownCloud instance will be unavailable for all users not in the admin group.
 +This is useful when performing maintenance.</td>
 +</tr>
 +<tr class="row-odd"><td><strong>Maintenance</strong></td>
 +<td>“maintenance” => false,</td>
 +<td>Enable maintenance mode to disable ownCloud.
 +When performing upgrades, ownCloud automatically enters maintenance mode.
 +When enabled, users who are already logged-in are kicked out of ownCloud instantly.</td>
 +</tr>
 +</tbody>
 +</table>
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/config/miscellaneous.html
index fd03865,0000000..68a6d1b
mode 100644,000000..100644
--- a/core/doc/admin/config/miscellaneous.html
+++ b/core/doc/admin/config/miscellaneous.html
@@@ -1,224 -1,0 +1,227 @@@
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>Miscellaneous — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '../',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="../_static/jquery.js"></script>
 +    <script type="text/javascript" src="../_static/underscore.js"></script>
 +    <script type="text/javascript" src="../_static/doctools.js"></script>
 +    <script type="text/javascript" src="../_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
 +    <link rel="up" title="The Configuration File" href="index.html" />
 +    <link rel="next" title="Issues" href="../issues/index.html" />
 +    <link rel="prev" title="Maintenance" href="maintenance.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="../contents.html">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
 +<ul class="current">
 +<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../apps/index.html">Apps</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../sharing_api/index.html">Sharing API</a></li>
 +<li class="toctree-l1 current"><a class="reference internal" href="index.html">The Configuration File</a><ul class="current">
 +<li class="toctree-l2"><a class="reference internal" href="default_parameters.html">Default Parameters</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="reverse_proxy_configurations.html">Reverse Proxy Configurations</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="user_experience.html">User Experience</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="mail_parameters.html">Mail Parameters</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="deleted_items.html">Deleted Items</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="verification.html">Verification</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="logging.html">Logging</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="session_info.html">Session Info</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="code_locations.html">Code Locations</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="apps.html">APPS</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="previews.html">Previews</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="maintenance.html">Maintenance</a></li>
 +<li class="toctree-l2 current"><a class="current reference internal" href="">Miscellaneous</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <div class="section" id="miscellaneous">
 +<h1>Miscellaneous<a class="headerlink" href="#miscellaneous" title="Permalink to this headline">¶</a></h1>
 +<p>The remaining parameters are listed below.</p>
 +<table border="1" class="docutils">
 +<colgroup>
 +<col width="5%" />
 +<col width="47%" />
 +<col width="48%" />
 +</colgroup>
 +<tbody valign="top">
 +<tr class="row-odd"><td><strong>Parameter</strong></td>
 +<td><strong>Format</strong></td>
 +<td><strong>Description</strong></td>
 +</tr>
 +<tr class="row-even"><td><strong>Open SSL</strong></td>
 +<td><p class="first">‘openssl’ => array(</p>
 +<p>//’config’ => ‘/absolute/location/of/openssl.cnf’,</p>
 +<p class="last">),</p>
 +</td>
 +<td> </td>
 +</tr>
 +<tr class="row-odd"><td><strong>User Backends</strong></td>
 +<td><p class="first">‘user_backends’=>array(</p>
 +<p>array(</p>
 +<p>‘class’=>’OC_User_IMAP’,</p>
 +<p>‘arguments’=>array(‘{imap.gmail.com:993/imap/ssl}INBOX’),</p>
 +<p>),</p>
 +<p class="last">),</p>
 +</td>
 +<td>It is possible to configure additional user backends in ownCloud.
 +The “External user Support” (user_external) app provides the following backends: IMAP (OC_User_IMAP), SMB (OC_User_SMB), FTP (OC_User_FTP).</td>
 +</tr>
 +<tr class="row-even"><td><strong>CSP Policy</strong></td>
- <td>“custom_csp_policy” => “default-src ‘self’; script-src ‘self’ ‘unsafe-eval’; style-src ‘self’ ‘unsafe-inline’; frame-src <a href="#id1"><span class="problematic" id="id2">*</span></a>; img-src <a href="#id3"><span class="problematic" id="id4">*</span></a>; font-src ‘self’ data:; media-src <a href="#id5"><span class="problematic" id="id6">*</span></a>”,</td>
++<td>“custom_csp_policy” => “default-src ‘self’; script-src ‘self’ ‘unsafe-eval’; style-src ‘self’ ‘unsafe-inline’; frame-src *; img-src *; font-src ‘self’ data:; media-src *”,</td>
 +<td> </td>
 +</tr>
 +<tr class="row-odd"><td><strong>X Frame</strong></td>
 +<td>“xframe_restriction” => true,</td>
 +<td>XFrame-restriction is a header which
 +prevents browsers from showing the site inside an iframe.
 +This may be used to prevent clickjacking.</td>
 +</tr>
 +<tr class="row-even"><td><strong>Mem Cache</strong></td>
 +<td>“memcached_server” => array(‘localhost’, 11211),</td>
 +<td>Server details for one or more memcached servers to use for memory caching.
 +Memcache is only used if other memory cache options (xcache, apc, apcu) are not available.</td>
 +</tr>
 +<tr class="row-odd"><td><strong>Force SSL</strong></td>
 +<td>“forcessl” => false,</td>
 +<td>If the admin checks “Enforce HTTPS” in the Admin page of the ownCloud WebUI. This will be set to true indicating that only HTTPS may be used to access this instance of ownCloud.
 +HTTP requests will be denied.</td>
 +</tr>
 +<tr class="row-even"><td><strong>Black List</strong></td>
 +<td>“blacklisted_files” => array(‘.htaccess’),</td>
 +<td>Files listed in this array will not be uploaded to ownCloud.
 +It should be noted that wildcards are not supported in this array.
 +The configured must be exact file names to be blocked.
 +If wildcards are
 +required, use the ownCloud firewall.</td>
 +</tr>
 +</tbody>
 +</table>
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/config/previews.html
index 17a007b,0000000..8eb2332
mode 100644,000000..100644
--- a/core/doc/admin/config/previews.html
+++ b/core/doc/admin/config/previews.html
@@@ -1,208 -1,0 +1,211 @@@
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>Previews — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '../',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="../_static/jquery.js"></script>
 +    <script type="text/javascript" src="../_static/underscore.js"></script>
 +    <script type="text/javascript" src="../_static/doctools.js"></script>
 +    <script type="text/javascript" src="../_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
 +    <link rel="up" title="The Configuration File" href="index.html" />
 +    <link rel="next" title="Maintenance" href="maintenance.html" />
 +    <link rel="prev" title="APPS" href="apps.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="../contents.html">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
 +<ul class="current">
 +<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../apps/index.html">Apps</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../sharing_api/index.html">Sharing API</a></li>
 +<li class="toctree-l1 current"><a class="reference internal" href="index.html">The Configuration File</a><ul class="current">
 +<li class="toctree-l2"><a class="reference internal" href="default_parameters.html">Default Parameters</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="reverse_proxy_configurations.html">Reverse Proxy Configurations</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="user_experience.html">User Experience</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="mail_parameters.html">Mail Parameters</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="deleted_items.html">Deleted Items</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="verification.html">Verification</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="logging.html">Logging</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="session_info.html">Session Info</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="code_locations.html">Code Locations</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="apps.html">APPS</a></li>
 +<li class="toctree-l2 current"><a class="current reference internal" href="">Previews</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="maintenance.html">Maintenance</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="miscellaneous.html">Miscellaneous</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <div class="section" id="previews">
 +<h1>Previews<a class="headerlink" href="#previews" title="Permalink to this headline">¶</a></h1>
 +<p>ownCloud allows for thumbnail previews of files.
 +This section contains the different configuration parameters available for that functionality.</p>
 +<table border="1" class="docutils">
 +<colgroup>
 +<col width="18%" />
 +<col width="36%" />
 +<col width="46%" />
 +</colgroup>
 +<tbody valign="top">
 +<tr class="row-odd"><td><strong>Parameter</strong></td>
 +<td><strong>Format</strong></td>
 +<td><strong>Description</strong></td>
 +</tr>
 +<tr class="row-even"><td><strong>Enable Previews</strong></td>
 +<td>‘enable_previews’ => true,</td>
 +<td>When enabled, default, the user will have file thumbnails visible.
 +Disable to remove thumbnails.</td>
 +</tr>
 +<tr class="row-odd"><td><strong>Preview Width</strong></td>
 +<td>‘preview_max_x’ => null,</td>
 +<td>Maximum width of the thumbnail.
 +Default is null meaning no limit.</td>
 +</tr>
 +<tr class="row-even"><td><strong>Preview Height</strong></td>
 +<td>‘preview_max_y’ => null,</td>
 +<td>The maximum height of the thumbnail.
 +Default is set to null meaning no limit.</td>
 +</tr>
 +<tr class="row-odd"><td><strong>Scale Factor</strong></td>
 +<td>‘preview_max_scale_factor’ => 10,</td>
 +<td>Scale the thumbnail by this factor.
 +Default is 10.</td>
 +</tr>
 +<tr class="row-even"><td><strong>Libreoffice Path</strong></td>
 +<td>‘preview_libreoffice_path’ => ‘/usr/bin/libreoffice’,</td>
 +<td>ownCloud uses Libre Office for previews.
 +This parameter indicates the location of the Libre Office executable.</td>
 +</tr>
 +<tr class="row-odd"><td><strong>Libreoffice Parameters</strong></td>
 +<td>‘preview_office_cl_parameters’ => ‘’,</td>
 +<td>Use this if Libre Office requires additional arguments</td>
 +</tr>
 +</tbody>
 +</table>
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/config/reverse_proxy_configurations.html
index b8e5143,0000000..9424a83
mode 100644,000000..100644
--- a/core/doc/admin/config/reverse_proxy_configurations.html
+++ b/core/doc/admin/config/reverse_proxy_configurations.html
@@@ -1,218 -1,0 +1,221 @@@
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>Reverse Proxy Configurations — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '../',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="../_static/jquery.js"></script>
 +    <script type="text/javascript" src="../_static/underscore.js"></script>
 +    <script type="text/javascript" src="../_static/doctools.js"></script>
 +    <script type="text/javascript" src="../_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
 +    <link rel="up" title="The Configuration File" href="index.html" />
 +    <link rel="next" title="User Experience" href="user_experience.html" />
 +    <link rel="prev" title="Default Parameters" href="default_parameters.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="../contents.html">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
 +<ul class="current">
 +<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../apps/index.html">Apps</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../sharing_api/index.html">Sharing API</a></li>
 +<li class="toctree-l1 current"><a class="reference internal" href="index.html">The Configuration File</a><ul class="current">
 +<li class="toctree-l2"><a class="reference internal" href="default_parameters.html">Default Parameters</a></li>
 +<li class="toctree-l2 current"><a class="current reference internal" href="">Reverse Proxy Configurations</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="user_experience.html">User Experience</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="mail_parameters.html">Mail Parameters</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="deleted_items.html">Deleted Items</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="verification.html">Verification</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="logging.html">Logging</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="session_info.html">Session Info</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="code_locations.html">Code Locations</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="apps.html">APPS</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="previews.html">Previews</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="maintenance.html">Maintenance</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="miscellaneous.html">Miscellaneous</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <div class="section" id="reverse-proxy-configurations">
 +<h1>Reverse Proxy Configurations<a class="headerlink" href="#reverse-proxy-configurations" title="Permalink to this headline">¶</a></h1>
 +<p>The following parameters are used in the instance that Proxies are being used within the network.</p>
 +<table border="1" class="docutils">
 +<colgroup>
 +<col width="9%" />
 +<col width="14%" />
 +<col width="78%" />
 +</colgroup>
 +<tbody valign="top">
 +<tr class="row-odd"><td><strong>Parameter</strong></td>
 +<td><strong>Format</strong></td>
 +<td><strong>Description</strong></td>
 +</tr>
 +<tr class="row-even"><td><strong>Overwrite Host</strong></td>
 +<td>“overwritehost” => “”,</td>
 +<td><p class="first">By default, ownCloud attempts to detect what outside host can access the instance (www.example.com) for generating URLs.
 +However, due to some reverse proxies, the automatically detected value may be incorrect (www.example.com:88) which would lead to incorrect URLs being generated.
 +Use this field to enter the proper URL.</p>
 +<p>If set as follows: “overwritehost” => “<a class="reference external" href="http://www.example.com:88">http://www.example.com:88</a>”,</p>
 +<p class="last">When logging into ownCloud, the browser will point to port 88.</p>
 +</td>
 +</tr>
 +<tr class="row-odd"><td><strong>Overwrite Protocol</strong></td>
 +<td>“overwriteprotocol” => “”,</td>
 +<td><p class="first">When generating URLs, ownCloud attempts to detect whether the server is accessed via https or http.
 +However, if ownCloud is behind a proxy and the proxy handles the https calls, thereby leaving ownCloud running without SSL, ownCloud would not realize that ssl is in use which would result in incorrect URLs being generated.
 +Valid values are “http” and “https”.</p>
 +<p>If set as follows:</p>
 +<p>“overwriteprotocol” => “https”,</p>
 +<p class="last">ownCloud will generate all URLs as HTTPS rather than HTTP.</p>
 +</td>
 +</tr>
 +<tr class="row-even"><td><strong>Overwrite Web Root</strong></td>
 +<td>“overwritewebroot” => “”,</td>
 +<td>As with the host and protocol, ownCloud attempts to detect the webroot for generating URLs automatically.
 +The webroot is the path used to access ownCloud relative to the domain, for instance, if
 +<a class="reference external" href="http://www.example.com/owncloud">www.example.com/owncloud</a>
 +is the URL pointing to the ownCloud instance, the webroot would be /owncloud.
 +When proxies are in use, it may be difficult for ownCloud to detect this parameter resulting in invalid URLs.</td>
 +</tr>
 +<tr class="row-odd"><td><strong>Overwrite Cond Addr</strong></td>
 +<td>“overwritecondaddr” => “”,</td>
 +<td> </td>
 +</tr>
 +<tr class="row-even"><td><strong>Proxy</strong></td>
 +<td>“proxy” => “”,</td>
 +<td>In the instance where a proxy is required to access the internet, the proxy should be configured in this parameter.
 +ownCloud requires access to the internet for several functions, and thus needs to have the proxy information configured to access the internet.</td>
 +</tr>
 +<tr class="row-odd"><td><strong>Proxy User Password</strong></td>
 +<td>“proxyuserpwd” => “username:password”,</td>
 +<td>In the event that a proxy is configured and requires authentication, the username and password would be configured in this parameter.</td>
 +</tr>
 +</tbody>
 +</table>
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/config/session_info.html
index e71c323,0000000..c85b9ff
mode 100644,000000..100644
--- a/core/doc/admin/config/session_info.html
+++ b/core/doc/admin/config/session_info.html
@@@ -1,192 -1,0 +1,195 @@@
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>Session Info — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '../',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="../_static/jquery.js"></script>
 +    <script type="text/javascript" src="../_static/underscore.js"></script>
 +    <script type="text/javascript" src="../_static/doctools.js"></script>
 +    <script type="text/javascript" src="../_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
 +    <link rel="up" title="The Configuration File" href="index.html" />
 +    <link rel="next" title="Code Locations" href="code_locations.html" />
 +    <link rel="prev" title="Logging" href="logging.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="../contents.html">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
 +<ul class="current">
 +<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../apps/index.html">Apps</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../sharing_api/index.html">Sharing API</a></li>
 +<li class="toctree-l1 current"><a class="reference internal" href="index.html">The Configuration File</a><ul class="current">
 +<li class="toctree-l2"><a class="reference internal" href="default_parameters.html">Default Parameters</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="reverse_proxy_configurations.html">Reverse Proxy Configurations</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="user_experience.html">User Experience</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="mail_parameters.html">Mail Parameters</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="deleted_items.html">Deleted Items</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="verification.html">Verification</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="logging.html">Logging</a></li>
 +<li class="toctree-l2 current"><a class="current reference internal" href="">Session Info</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="code_locations.html">Code Locations</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="apps.html">APPS</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="previews.html">Previews</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="maintenance.html">Maintenance</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="miscellaneous.html">Miscellaneous</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <div class="section" id="session-info">
 +<h1>Session Info<a class="headerlink" href="#session-info" title="Permalink to this headline">¶</a></h1>
 +<p>The following parameters are related to sessions within ownCloud.</p>
 +<table border="1" class="docutils">
 +<colgroup>
 +<col width="13%" />
 +<col width="22%" />
 +<col width="65%" />
 +</colgroup>
 +<tbody valign="top">
 +<tr class="row-odd"><td><strong>Parameter</strong></td>
 +<td><strong>Format</strong></td>
 +<td><strong>Description</strong></td>
 +</tr>
 +<tr class="row-even"><td><strong>Remember Cookie Lifetime</strong></td>
 +<td>“remember_login_cookie_lifetime” => 60*60*24*15,</td>
 +<td>ownCloud provides the user the option of remembering their login credentials (this option appears as the “remember” checkbox on the login screen).
 +This parameter allows the admin to configure the length of time which ownCloud will remember that user.
 +Default is 15 days.
 +The configuration is in seconds.</td>
 +</tr>
 +<tr class="row-odd"><td><strong>Session Lifetime</strong></td>
 +<td>“session_lifetime” => 60 * 60 * 24,</td>
 +<td>ownCloud will automatically logout a user after a period of inactivity.
 +The default is 1 day.
 +This parameter can be used to modify that time.
 +Configuration is in seconds.</td>
 +</tr>
 +</tbody>
 +</table>
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/config/user_experience.html
index 790e72d,0000000..aded689
mode 100644,000000..100644
--- a/core/doc/admin/config/user_experience.html
+++ b/core/doc/admin/config/user_experience.html
@@@ -1,205 -1,0 +1,208 @@@
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>User Experience — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '../',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="../_static/jquery.js"></script>
 +    <script type="text/javascript" src="../_static/underscore.js"></script>
 +    <script type="text/javascript" src="../_static/doctools.js"></script>
 +    <script type="text/javascript" src="../_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
 +    <link rel="up" title="The Configuration File" href="index.html" />
 +    <link rel="next" title="Mail Parameters" href="mail_parameters.html" />
 +    <link rel="prev" title="Reverse Proxy Configurations" href="reverse_proxy_configurations.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="../contents.html">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
 +<ul class="current">
 +<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../apps/index.html">Apps</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../sharing_api/index.html">Sharing API</a></li>
 +<li class="toctree-l1 current"><a class="reference internal" href="index.html">The Configuration File</a><ul class="current">
 +<li class="toctree-l2"><a class="reference internal" href="default_parameters.html">Default Parameters</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="reverse_proxy_configurations.html">Reverse Proxy Configurations</a></li>
 +<li class="toctree-l2 current"><a class="current reference internal" href="">User Experience</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="mail_parameters.html">Mail Parameters</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="deleted_items.html">Deleted Items</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="verification.html">Verification</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="logging.html">Logging</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="session_info.html">Session Info</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="code_locations.html">Code Locations</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="apps.html">APPS</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="previews.html">Previews</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="maintenance.html">Maintenance</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="miscellaneous.html">Miscellaneous</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <div class="section" id="user-experience">
 +<h1>User Experience<a class="headerlink" href="#user-experience" title="Permalink to this headline">¶</a></h1>
 +<p>The following parameters are those that influence the end user’s experience.</p>
 +<table border="1" class="docutils">
 +<colgroup>
 +<col width="11%" />
 +<col width="24%" />
 +<col width="65%" />
 +</colgroup>
 +<tbody valign="top">
 +<tr class="row-odd"><td><strong>Parameter</strong></td>
 +<td><strong>Format</strong></td>
 +<td><strong>Description</strong></td>
 +</tr>
 +<tr class="row-even"><td><strong>Default Language</strong></td>
 +<td>“default_language” => “en”,</td>
 +<td>This is the default language for the ownCloud WebUI. When configured, the default language will be the same for all users.
 +Users may then configure their own language preference in their Personal page.
 +When not configured, the default language is determined form the headers sent by the web browser.
 +For instance, if the browser is in Spanish, ownCloud will be presented in Spanish</td>
 +</tr>
 +<tr class="row-odd"><td><strong>Default App</strong></td>
 +<td>“defaultapp” => “files”,</td>
 +<td>By default, when a user logs into ownCloud, they are brought to the files page.
 +If, for instance, the admin desires a different page to be loaded upon login, configure that app here.
 +Valid values are app id’s (for example news, files, gallery).</td>
 +</tr>
 +<tr class="row-even"><td><strong>Knowledge Base **
 +**Enabled</strong></td>
 +<td>“knowledgebaseenabled” => true,</td>
 +<td>When enabled, default, the help menu brings up the user documentation.</td>
 +</tr>
 +<tr class="row-odd"><td><strong>Enable Avatars</strong></td>
 +<td>‘enable_avatars’ => true,</td>
 +<td>Allows for the ability to use avatars.</td>
 +</tr>
 +<tr class="row-even"><td><strong>Display Name</strong></td>
 +<td>‘allow_user_to_change_display_name’ => true,</td>
 +<td>Users can modify their display name in the Personal page.
 +If this parameter is set to false, they may not change their display name.</td>
 +</tr>
 +</tbody>
 +</table>
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/config/verification.html
index 355ace4,0000000..f56b54a
mode 100644,000000..100644
--- a/core/doc/admin/config/verification.html
+++ b/core/doc/admin/config/verification.html
@@@ -1,201 -1,0 +1,204 @@@
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>Verification — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '../',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="../_static/jquery.js"></script>
 +    <script type="text/javascript" src="../_static/underscore.js"></script>
 +    <script type="text/javascript" src="../_static/doctools.js"></script>
 +    <script type="text/javascript" src="../_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
 +    <link rel="up" title="The Configuration File" href="index.html" />
 +    <link rel="next" title="Logging" href="logging.html" />
 +    <link rel="prev" title="Deleted Items" href="deleted_items.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="../contents.html">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
 +<ul class="current">
 +<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../apps/index.html">Apps</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../sharing_api/index.html">Sharing API</a></li>
 +<li class="toctree-l1 current"><a class="reference internal" href="index.html">The Configuration File</a><ul class="current">
 +<li class="toctree-l2"><a class="reference internal" href="default_parameters.html">Default Parameters</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="reverse_proxy_configurations.html">Reverse Proxy Configurations</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="user_experience.html">User Experience</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="mail_parameters.html">Mail Parameters</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="deleted_items.html">Deleted Items</a></li>
 +<li class="toctree-l2 current"><a class="current reference internal" href="">Verification</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="logging.html">Logging</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="session_info.html">Session Info</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="code_locations.html">Code Locations</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="apps.html">APPS</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="previews.html">Previews</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="maintenance.html">Maintenance</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="miscellaneous.html">Miscellaneous</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <div class="section" id="verification">
 +<h1>Verification<a class="headerlink" href="#verification" title="Permalink to this headline">¶</a></h1>
 +<p>This section describes different verification checks that ownCloud may perform.</p>
 +<table border="1" class="docutils">
 +<colgroup>
 +<col width="16%" />
 +<col width="21%" />
 +<col width="63%" />
 +</colgroup>
 +<tbody valign="top">
 +<tr class="row-odd"><td><strong>Parameter</strong></td>
 +<td><strong>Format</strong></td>
 +<td><strong>Description</strong></td>
 +</tr>
 +<tr class="row-even"><td><strong>Update Checker</strong></td>
 +<td>“updatechecker” => true,</td>
 +<td>Provides information as to whether there is a new release of ownCloud available.
 +When enabled, default, a banner will appear on the admin’s web interface when a newer version of ownCloud exists.</td>
 +</tr>
 +<tr class="row-odd"><td><strong>Has Internet Connection</strong></td>
 +<td>“has_internet_connection” => true,</td>
 +<td>Alerts ownCloud if there is an internet connection (true – default).
 +If set to false, ownCloud will not be able to look for updates, display the knowledgebase, or bring up the appstore.</td>
 +</tr>
 +<tr class="row-even"><td><strong>Working WebDAV</strong></td>
 +<td>“check_for_working_webdav” => true,</td>
 +<td>Allows ownCloud to verify a working WebDAV connection.
 +This is done by attempting to make a WebDAV request from PHP.</td>
 +</tr>
 +<tr class="row-odd"><td><strong>Working .htaccess</strong></td>
 +<td>“check_for_working_htaccess” => true,</td>
 +<td>Verifies whether the .htaccess file may be modified by ownCloud.
 +If set to false, this check will not be
 +performed.
 +If the file cannot be modified, items such as large file uploads cannot be performed.
 +This check only affects Apache servers.</td>
 +</tr>
 +</tbody>
 +</table>
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/configuration/auth_ldap.html
index 6bac9db,0000000..f2d7b13
mode 100644,000000..100644
--- a/core/doc/admin/configuration/auth_ldap.html
+++ b/core/doc/admin/configuration/auth_ldap.html
@@@ -1,784 -1,0 +1,787 @@@
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>LDAP Authentication — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '../',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="../_static/jquery.js"></script>
 +    <script type="text/javascript" src="../_static/underscore.js"></script>
 +    <script type="text/javascript" src="../_static/doctools.js"></script>
 +    <script type="text/javascript" src="../_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
 +    <link rel="up" title="Configuration" href="index.html" />
 +    <link rel="next" title="Background Jobs" href="background_jobs.html" />
 +    <link rel="prev" title="User Management" href="configuration_users.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="../contents.html">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
 +<ul class="current">
 +<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
 +<li class="toctree-l1 current"><a class="reference internal" href="index.html">Configuration</a><ul class="current">
 +<li class="toctree-l2"><a class="reference internal" href="configuration_apps.html">Managing Apps</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_users.html">User Management</a></li>
 +<li class="toctree-l2 current"><a class="current reference internal" href="">LDAP Authentication</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="#configuration">Configuration</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="#advanced-settings">Advanced Settings</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="#expert-settings">Expert Settings</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="#testing-the-configuration">Testing the configuration</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="#owncloud-avatar-integration">ownCloud Avatar integration</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="#troubleshooting-tips-and-tricks">Troubleshooting, Tips and Tricks</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="#ssl-certificate-verification-ldaps-tls">SSL Certificate Verification (LDAPS, TLS)</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="#microsoft-active-directory">Microsoft Active Directory</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="#duplicating-server-configurations">Duplicating Server Configurations</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="#owncloud-ldap-internals">ownCloud LDAP Internals</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="#groups">Groups</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="#user-and-group-mapping">User and Group Mapping</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="#caching">Caching</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="#handling-with-backup-server">Handling with Backup Server</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="background_jobs.html">Background Jobs</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_3rdparty.html">Find Third-Party Libraries</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_automation.html">Automatic Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_custom_clients.html">Customizing Client Download Links</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_database.html">MySQL/Postgres/SQLite Support</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_encryption.html">Using Server-Side Encryption</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_knowledgebase.html">Disable Knowledge Base</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_language.html">Setting the Default Language</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_logging.html">Configure Logging</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_mail.html">Sending Mail Notifications</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_maintenance.html">Enable Maintenance Mode</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_preview.html">Enabling File Previews</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_reverseproxy.html">Reverse Proxy Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html">Dealing with Big File Uploads</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="custom_mount_config_gui.html">Custom Mount Configuration Web-GUI</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="custom_mount_config.html">Custom Mount Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="custom_user_backend.html">Custom User Backend Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="xsendfile.html">Serving static files via web server</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l1"><a class="reference internal" href="../apps/index.html">Apps</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../sharing_api/index.html">Sharing API</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../config/index.html">The Configuration File</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <div class="section" id="ldap-authentication">
 +<h1>LDAP Authentication<a class="headerlink" href="#ldap-authentication" title="Permalink to this headline">¶</a></h1>
 +<p>ownCloud ships an LDAP backend, which allows full use of ownCloud for users
 +logging in with LDAP credentials including:</p>
 +<ul class="simple">
 +<li>LDAP group support</li>
 +<li>File sharing with users and groups</li>
 +<li>Access via WebDAV and of course ownCloud Desktop Client</li>
 +<li>Versioning, external Storages and all other ownCloud goodies</li>
 +</ul>
 +<p>To connect to an LDAP server the configuration needs to be set up properly.
 +Once the LDAP backend is activated (Apps Sidebar→Apps, choose <strong>LDAP user and
 +group backend</strong>, click on <strong>Enable</strong>) the configuration can be found on
 +Settings→Admin. Read on for a detailed description of the configuration fields.</p>
 +<div class="section" id="configuration">
 +<h2>Configuration<a class="headerlink" href="#configuration" title="Permalink to this headline">¶</a></h2>
 +<p>The LDAP backend configuration follows a wizard-like approach, split into four tabs. A
 +correctly completed first tab (“Server”) is mandatory to access the other tabs.
 +The settings in the other tabs are detected automatically, but should be reviewed by the
 +admin. An indicator will show whether the configuration is incomplete, incorrect or OK.</p>
 +<p>The settings are changed automatically, as soon as a input element loses the
 +focus, i.e. the cursor is taken away by clicking somewhere else or pressing the
 +Tab key.</p>
 +<p>The other tabs can be navigated by clicking the tabs or by using the <em>Continue</em>
 +and <em>Back</em> buttons. They are located on the lower right, next to the status
 +indicator.</p>
 +<div class="section" id="server">
 +<h3>Server<a class="headerlink" href="#server" title="Permalink to this headline">¶</a></h3>
 +<p>The Server tab contains the basic information on the LDAP server. They make sure
 +that ownCloud will be able to connect to LDAP and be able to read data from
 +there. The admin at least needs to provide a hostname. If anonymous access is
 +not possible he will need to provide an account DN and a password, too. ownCloud
 +attempts to auto-detect the port and the base DN.</p>
 +<div class="figure">
 +<img alt="../_images/ldap-wizard-1-server.png" src="../_images/ldap-wizard-1-server.png" />
 +</div>
 +<dl class="docutils">
 +<dt>Server configuration:</dt>
 +<dd>ownCloud can be configured to connect to multiple LDAP servers. Using this
 +control you can pick a configuration you want to edit or add a new one. The
 +button <strong>Delete Configuration</strong> deletes the current configuration.</dd>
 +<dt>Host:</dt>
 +<dd><p class="first">The host name of the LDAP server. It can also be a <strong>ldaps://</strong> URI, for
 +instance.</p>
 +<p>It is also possible to pass a port number, which speeds up port detection. It
 +is especially useful, if a custom port is used. ownCloud will move the value
 +to the port field subsequently.</p>
 +<p>Examples:</p>
 +<ul class="last simple">
 +<li><em>directory.my-company.com</em></li>
 +<li><em>ldaps://directory.my-company.com</em></li>
 +<li><em>directory.my-company.com:9876</em></li>
 +</ul>
 +</dd>
 +<dt>Port:</dt>
 +<dd><p class="first">The port on which to connect to the LDAP server. The field is disabled in the
 +beginning of a new configuration. The port will be detected automatically,
 +if the LDAP server is running on a standard port. After ownCloud attempted to
 +determine the port, the field will be enabled for user input. A successfully
 +found port will be inserted by ownCloud, of course.</p>
 +<p>Example:</p>
 +<ul class="last simple">
 +<li><em>389</em></li>
 +</ul>
 +</dd>
 +<dt>User DN:</dt>
 +<dd><p class="first">The name as DN of a user who is able to do searches in the LDAP
 +directory. Leave it empty for anonymous access. It is recommended to have a
 +special system user for ownCloud.</p>
 +<p>Example:</p>
 +<ul class="last simple">
 +<li><em>uid=owncloudsystemuser,cn=sysusers,dc=my-company,dc=com</em></li>
 +</ul>
 +</dd>
 +<dt>Password:</dt>
 +<dd>The password for the user given above. Empty for anonymous access.</dd>
 +<dt>Base DN:</dt>
 +<dd><p class="first">The base DN of LDAP, from where all users and groups can be reached. Separated
 +Base DNs for users and groups can be set in the Advanced tab. Nevertheless,
 +this field is mandatory. ownCloud attempts to determine the Base DN according
 +to the provided User DN or the provided Host.</p>
 +<p>Example:</p>
 +<ul class="last simple">
 +<li><em>dc=my-company,dc=com</em></li>
 +</ul>
 +</dd>
 +</dl>
 +</div>
 +<div class="section" id="user-filter">
 +<h3>User Filter<a class="headerlink" href="#user-filter" title="Permalink to this headline">¶</a></h3>
 +<p>The settings in the User Filter tab determine which LDAP users will appear and
 +are allowed to log in into ownCloud. It is also possible to enter a raw LDAP
 +filter.</p>
 +<div class="figure">
 +<img alt="../_images/ldap-wizard-2-user.png" src="../_images/ldap-wizard-2-user.png" />
 +</div>
 +<dl class="docutils">
 +<dt>only those object classes:</dt>
 +<dd>ownCloud will determine the object classes that are typically available for
 +(ideally only) user objects in your LDAP. ownCloud will automatically select
 +the object class that returns the highest amount of users. You can select
 +multiple object classes.</dd>
 +<dt>only from those groups:</dt>
 +<dd><p class="first">If your LDAP server supports the member-of-overlay in LDAP filters, you can
 +define that only users from one or more certain groups are allowed to
 +appear and log in into ownCloud. By default, no value will be selected. You
 +can select multiple groups.</p>
 +<p class="last">If your LDAP server does not support the member-of-overlay in LDAP filters,
 +the input field is disabled. Please contact your LDAP administrator.</p>
 +</dd>
 +<dt>Edit raw filter instead:</dt>
 +<dd><p class="first">Clicking on this text will toggle the filter mode. Instead of the assisted
 +approach, you can enter the raw LDAP filter directly in the appearing field.</p>
 +<p>Example:</p>
 +<ul class="last simple">
 +<li><em>objectClass=inetOrgPerson</em></li>
 +</ul>
 +</dd>
 +<dt>x users found:</dt>
 +<dd>This is an indicator that tells you approximately how many users will be
 +allowed to access ownCloud. The number will update after any change you do.</dd>
 +</dl>
 +</div>
 +<div class="section" id="login-filter">
 +<h3>Login Filter<a class="headerlink" href="#login-filter" title="Permalink to this headline">¶</a></h3>
 +<p>The settings in the Login Filter tab determine which user detail will be
 +compared to the login value entered by the user. It is possible to allow
 +multiple user details. It is also possible to enter a raw LDAP filter.</p>
 +<p>The user limitation as set up in the previous tab is in effect, unless you
 +manually configure the filter in raw mode.</p>
 +<div class="figure">
 +<img alt="../_images/ldap-wizard-3-login.png" src="../_images/ldap-wizard-3-login.png" />
 +</div>
 +<dl class="docutils">
 +<dt>LDAP Username:</dt>
 +<dd>If this value is checked, the login value will be compared to the username in
 +the LDAP directory. The corresponding attribute, usually <em>uid</em> or
 +<em>samaccountname</em> will be detected automatically by ownCloud.</dd>
 +<dt>LDAP Email Address:</dt>
 +<dd>If this value is checked, the login value will be compared to an email address
 +in the LDAP directory. The email address will be looked for in the
 +<em>mailPrimaryAddress</em> and <em>mail</em> attributes.</dd>
 +<dt>Other Attributes:</dt>
 +<dd>This multiselect box allows you to select other attributes for the comparison.
 +The list is generated automatically based on the attributes that a user object
 +contains in your LDAP server.</dd>
 +<dt>Edit raw filter instead:</dt>
 +<dd><p class="first">Clicking on this text will toggle the filter mode. Instead of the assisted
 +approach, you can enter the raw LDAP filter directly in the appearing field.</p>
 +<p>The <strong>%uid</strong> placeholder will be replaced with the login name entered by the user
 +upon login. When you enter the filter manually.</p>
 +<p>Examples:</p>
 +<ul class="last simple">
 +<li>only username: <em>uid=%uid</em></li>
 +<li>username or email address: <em>(|(uid=%uid)(mail=$uid))</em></li>
 +</ul>
 +</dd>
 +</dl>
 +</div>
 +<div class="section" id="group-filter">
 +<h3>Group Filter<a class="headerlink" href="#group-filter" title="Permalink to this headline">¶</a></h3>
 +<p>The settings in the Group Filter tab determine which groups will be available
 +in ownCloud. It does not have any restrictions on logins, this has been dealt
 +with in the prior tabs.  It is also possible to enter a raw LDAP
 +filter.</p>
 +<p>By default, no groups will be available in ownCloud. You actively need to
 +enable groups.</p>
 +<div class="figure">
 +<img alt="../_images/ldap-wizard-4-group.png" src="../_images/ldap-wizard-4-group.png" />
 +</div>
 +<dl class="docutils">
 +<dt>only those object classes:</dt>
 +<dd>ownCloud will determine the object classes that are typically available for
 +(ideally only) group objects in your LDAP. ownCloud will only list object
 +classes that return at least one group object. You can select multiple
 +object classes. A typical object class is “group”, or “posixGroup”.</dd>
 +<dt>only from those groups:</dt>
 +<dd>This setting lets you pick certain groups that shall be available in
 +ownCloud. This field follows a whitelist approach. ownCloud will generate a
 +list of available groups found in your LDAP server. You can select multiple
 +groups.</dd>
 +<dt>Edit raw filter instead:</dt>
 +<dd><p class="first">Clicking on this text will toggle the filter mode. Instead of the assisted
 +approach, you can enter the raw LDAP filter directly in the appearing field.</p>
 +<p>Example:</p>
 +<ul class="last simple">
 +<li><em>objectClass=group</em></li>
 +<li><em>objectClass=posixGroup</em></li>
 +</ul>
 +</dd>
 +<dt>y groups found:</dt>
 +<dd>This is an indicator that tells you approximately how many groups will be
 +available in  ownCloud. The number will update after any change you do.</dd>
 +</dl>
 +</div>
 +</div>
 +<div class="section" id="advanced-settings">
 +<h2>Advanced Settings<a class="headerlink" href="#advanced-settings" title="Permalink to this headline">¶</a></h2>
 +<p>In the LDAP Advanced Settings section you can define options, that are less
 +common to set. They are not needed for a working connection. It can also have a
 +positive effect on the performance to specify distinguished bases for user and
 +group searches.</p>
 +<p>The Advanced Settings are structured into three parts:</p>
 +<ul class="simple">
 +<li>Connection Settings</li>
 +<li>Directory Settings</li>
 +<li>Special Attributes</li>
 +</ul>
 +<div class="section" id="connection-settings">
 +<h3>Connection Settings<a class="headerlink" href="#connection-settings" title="Permalink to this headline">¶</a></h3>
 +<div class="figure">
 +<img alt="../_images/ldap-advanced-1-connection.png" src="../_images/ldap-advanced-1-connection.png" />
 +<p class="caption">LDAP Advanced Settings, section Connection Settings</p>
 +</div>
 +<dl class="docutils">
 +<dt>Configuration Active:</dt>
 +<dd><p class="first">Enables or Disables the current configuration. Disabled configuration will not
 +connect to the LDAP server.</p>
 +<p class="last">By default, it is turned off. It will be automatically turned on, when using
 +the wizard and the configuration is OK and a test connection successful.</p>
 +</dd>
 +<dt>Backup (Replica) Host:</dt>
 +<dd><p class="first">A backup server can be defined here. ownCloud tries to connect to the backup
 +server automatically, when the main host (as specified in basic settings)
 +cannot be reached. It is important that the backup server is a replica of the
 +main server, because the object UUIDs must match.</p>
 +<p>Example:</p>
 +<ul class="last simple">
 +<li><em>directory2.my-company.com</em></li>
 +</ul>
 +</dd>
 +<dt>Backup (Replica) Port:</dt>
 +<dd><p class="first">The port on which to connect to the backup LDAP server. If no port is given,
 +but a host, then the main port (as specified above) will be used.</p>
 +<p>Example:</p>
 +<ul class="last simple">
 +<li><em>389</em></li>
 +</ul>
 +</dd>
 +<dt>Disable Main Server:</dt>
 +<dd>You can manually override the main server and make ownCloud only connect to
 +the backup server. This may be handy for planned downtimes.</dd>
 +<dt>Case insensitive LDAP server (Windows):</dt>
 +<dd>Whether the LDAP server is running on a Windows host. Usually, it is not
 +necessary to check it, however.</dd>
 +<dt>Turn off SSL certificate validation:</dt>
 +<dd>Turns off check of valid SSL certificates. Use it – if needed –
 +for testing, only!</dd>
 +<dt>Cache Time-To-Live:</dt>
 +<dd><p class="first">A cache is introduced to avoid unnecessary LDAP traffic,
 +for example lookups check whether the users exist on every page request or
 +WebDAV interaction. It is also supposed to speed up the Admin → User page or
 +list of users to share with, once it is populated. Saving the configuration
 +empties the cache (changes are not necessary). The time is given in seconds.</p>
 +<p>Note that almost every PHP request would require to build up a new connection
 +to the LDAP server. If you require most up-to-dateness it is recommended not
 +to totally switch off the cache, but define a minimum life time of 15s.</p>
 +<p>Examples:</p>
 +<ul class="last simple">
 +<li>ten minutes: <em>600</em></li>
 +<li>one hour: <em>3600</em></li>
 +</ul>
 +</dd>
 +</dl>
 +</div>
 +<div class="section" id="directory-settings">
 +<h3>Directory Settings<a class="headerlink" href="#directory-settings" title="Permalink to this headline">¶</a></h3>
 +<div class="figure">
 +<img alt="../_images/ldap-advanced-2-directory.png" src="../_images/ldap-advanced-2-directory.png" />
 +<p class="caption">LDAP Advanced Settings, section Directory Settings</p>
 +</div>
 +<dl class="docutils">
 +<dt>User Display Name Field:</dt>
 +<dd><p class="first">The attribute that should be used as display name in ownCloud.</p>
 +<ul class="last simple">
 +<li>Example: <em>displayName</em></li>
 +</ul>
 +</dd>
 +<dt>Base User Tree:</dt>
 +<dd><p class="first">The base DN of LDAP, from where all users can be reached. It needs to be given
 +completely despite to the Base DN from the Basic settings. You can specify
 +multiple base trees, one in each line.</p>
 +<ul class="last">
 +<li><p class="first">Example:</p>
 +<div class="line-block">
 +<div class="line"><em>cn=programmers,dc=my-company,dc=com</em></div>
 +<div class="line"><em>cn=designers,dc=my-company,dc=com</em></div>
 +</div>
 +</li>
 +</ul>
 +</dd>
 +<dt>User Search Attributes:</dt>
 +<dd><p class="first">These attributes are used when a search for users is done. This happens, for
 +instance, in the share dialogue. By default the user display name attribute as
 +specified above is being used. Multiple attributes can be given, one in each
 +line.</p>
 +<p>Beware that if an attribute is not available on a user object, the user will
 +neither be listed (e.g. in the share dialogue) nor be able to login. This also
 +affects the display name attribute as specified above. If you override the
 +default, the display name attribute will not be taken into account, unless you
 +specify it as well.</p>
 +<ul class="last">
 +<li><p class="first">Example:</p>
 +<div class="line-block">
 +<div class="line"><em>displayName</em></div>
 +<div class="line"><em>mail</em></div>
 +</div>
 +</li>
 +</ul>
 +</dd>
 +<dt>Group Display Name Field:</dt>
 +<dd><p class="first">The attribute that should be used as ownCloud group name. ownCloud allows a
 +limited set of characters (a-zA-Z0-9.-_@), every other character will be
 +replaced in ownCloud. Once a group name is assigned, it will not be changed,
 +i.e. changing this value will only have effect to new LDAP groups.</p>
 +<ul class="last simple">
 +<li>Example: <em>cn</em></li>
 +</ul>
 +</dd>
 +<dt>Base Group Tree:</dt>
 +<dd><p class="first">The base DN of LDAP, from where all groups can be reached.
 +It needs to be given completely despite to the Base DN from the Basic
 +settings. You can specify multiple base trees, one in each line.</p>
 +<ul class="last">
 +<li><p class="first">Example:</p>
 +<div class="line-block">
 +<div class="line"><em>cn=barcelona,dc=my-company,dc=com</em></div>
 +<div class="line"><em>cn=madrid,dc=my-company,dc=com</em></div>
 +</div>
 +</li>
 +</ul>
 +</dd>
 +<dt>Group Search Attributes:</dt>
 +<dd><p class="first">These attributes are used when a search for groups is done. This happens, for
 +instance, in the share dialogue. By default the group display name attribute
 +as specified above is being used. Multiple attributes can be given, one in
 +each line.</p>
 +<p>If you override the default, the group display name attribute will not be
 +taken into account, unless you specify it as well.</p>
 +<ul class="last">
 +<li><p class="first">Example:</p>
 +<div class="line-block">
 +<div class="line"><em>cn</em></div>
 +<div class="line"><em>description</em></div>
 +</div>
 +</li>
 +</ul>
 +</dd>
 +<dt>Group Member association:</dt>
 +<dd><p class="first">The attribute that is used to indicate group memberships, i.e. the attribute
 +used by LDAP groups to refer to their users.</p>
 +<p>ownCloud detects the value automatically. You should only change it if you
 +have a very valid reason and know what you are doing.</p>
 +<ul class="last simple">
 +<li>Example: <em>uniquemember</em></li>
 +</ul>
 +</dd>
 +</dl>
 +</div>
 +<div class="section" id="special-attributes">
 +<h3>Special Attributes<a class="headerlink" href="#special-attributes" title="Permalink to this headline">¶</a></h3>
 +<div class="figure">
 +<img alt="../_images/ldap-advanced-3-attributes.png" src="../_images/ldap-advanced-3-attributes.png" />
 +<p class="caption">LDAP Advanced Settings, section Special Attributes</p>
 +</div>
 +<dl class="docutils">
 +<dt>Quota Field:</dt>
 +<dd><p class="first">ownCloud can read an LDAP attribute and set the user quota according to its
 +value. Specify the attribute here, otherwise keep it empty. The attribute
 +shall return human readable values, e.g. “2 GB”.</p>
 +<ul class="last simple">
 +<li>Example: <em>ownCloudQuota</em></li>
 +</ul>
 +</dd>
 +<dt>Quota Default:</dt>
 +<dd><p class="first">Override ownCloud default quota for LDAP users who do not
 +have a quota set in the attribute given above.</p>
 +<ul class="last simple">
 +<li>Example: <em>15 GB</em></li>
 +</ul>
 +</dd>
 +<dt>Email Field:</dt>
 +<dd><p class="first">ownCloud can read an LDAP attribute and set the user email
 +there from. Specify the attribute here, otherwise keep it empty.</p>
 +<p>Although the wizard offers you to check login by email, the correct email
 +attribute is not detected and you need to specify it manually.</p>
 +<ul class="last simple">
 +<li>Example: <em>mail</em></li>
 +</ul>
 +</dd>
 +<dt>User Home Folder Naming Rule:</dt>
 +<dd><p class="first">By default, the ownCloud creates the user
 +directory, where all files and meta data are kept, according to the ownCloud
 +user name. You may want to override this setting and name it after an
 +attribute value. The attribute given can also return an absolute path, e.g.
 +<tt class="docutils literal"><span class="pre">/mnt/storage43/alice</span></tt>. Leave it empty for default behavior.</p>
 +<ul class="last simple">
 +<li>Example: <em>cn</em></li>
 +</ul>
 +</dd>
 +</dl>
 +</div>
 +</div>
 +<div class="section" id="expert-settings">
 +<h2>Expert Settings<a class="headerlink" href="#expert-settings" title="Permalink to this headline">¶</a></h2>
 +<div class="figure">
 +<img alt="../_images/ldap-expert.png" src="../_images/ldap-expert.png" />
 +</div>
 +<p>In the Expert Settings fundamental behavior can be adjusted to your needs. The
 +configuration should be done before starting production use or when testing the
 +installation.</p>
 +<dl class="docutils">
 +<dt>Internal Username:</dt>
 +<dd><p class="first">The internal username is the identifier in ownCloud for LDAP users. By default
 +it will be created from the UUID attribute. By using the UUID attribute it is
 +made sure that the username is unique and characters do not need to be
 +converted. The internal username has the restriction that only these
 +characters are allowed: [a-zA-Z0-9_.@-]. Other characters are replaced with
 +their ASCII correspondence or are simply omitted.</p>
 +<p>The LDAP backend ensures that there are no duplicate internal usernames in
 +ownCloud, i.e. that it is checking all other activated user backends
 +(including local ownCloud users). On collisions a random number (between 1000
 +and 9999) will be attached to the retrieved value. For example, if “alice”
 +exists, the next username may be “alice_1337”.</p>
 +<p>The internal username is also the default name for the user home folder in
 +ownCloud. It is also a part of remote URLs, for instance for all *DAV services.
 +With this setting the default behaviour can be overridden.</p>
 +<p>Leave it empty for default behaviour. Changes will have effect only on newly
 +mapped (added) LDAP users.</p>
 +<ul class="last simple">
 +<li>Example: <em>uid</em></li>
 +</ul>
 +</dd>
 +<dt>Override UUID detection</dt>
 +<dd><p class="first">By default, ownCloud auto-detects the UUID attribute. The UUID attribute is
 +used to doubtlessly identify LDAP users and groups. Also, the internal
 +username will be created based on the UUID, if not specified otherwise above.</p>
 +<p>You can override the setting and pass an attribute of your choice. You must
 +make sure that the attribute of your choice can be fetched for both users and
 +groups and it is unique. Leave it empty for default behaviour. Changes will
 +have effect only on newly mapped (added) LDAP users and groups. It also will
 +have effect when a user’s or group’s DN changes and an old UUID was cached: it
 +will result in a new user. Because of this, the setting should be applied
 +before putting ownCloud in production use and cleaning the bindings
 +(see below).</p>
 +<ul class="last simple">
 +<li>Example: <em>cn</em></li>
 +</ul>
 +</dd>
 +<dt>Username-LDAP User Mapping</dt>
 +<dd><p class="first">ownCloud uses the usernames as key to store and assign data. In order to
 +precisely identify and recognize users, each LDAP user will have a internal
 +username in ownCloud. This requires a mapping from ownCloud username to LDAP
 +user. The created username is mapped to the UUID of the LDAP user.
 +Additionally the DN is cached as well to reduce LDAP interaction, but it is
 +not used for identification. If the DN changes, the change will be detected by
 +ownCloud by checking the UUID value.</p>
 +<p>The same is valid for groups.</p>
 +<p>The internal ownCloud name is used all over in ownCloud. Clearing the Mappings
 +will have leftovers everywhere. Never clear the mappings
 +in a production environment. Only clear mappings in a testing or experimental
 +stage.</p>
 +<p class="last"><strong>Clearing the Mappings is not configuration sensitive, it affects all LDAP
 +configurations!</strong></p>
 +</dd>
 +</dl>
 +</div>
 +<div class="section" id="testing-the-configuration">
 +<h2>Testing the configuration<a class="headerlink" href="#testing-the-configuration" title="Permalink to this headline">¶</a></h2>
 +<p>The <strong>Test Configuration</strong> button on the bottom
 +of the LDAP settings section will always check the values as currently
 +given in the input fields. You do not need to save before testing. By clicking
 +on the button, ownCloud will try to bind to the ownCloud server with the
 +settings currently given in the input fields. The response will look like this:</p>
 +<div class="figure">
 +<img alt="../_images/ldap-settings-invalid-oc45.png" src="../_images/ldap-settings-invalid-oc45.png" />
 +<p class="caption">Failure</p>
 +</div>
 +<p>In case the configuration fails, you can see details in ownCloud’s log, which
 +is in the data directory and called <strong>owncloud.log</strong> or on the bottom the
 +<strong>Settings →  Admin page</strong>. Unfortunately it requires a reload – sorry for the
 +inconvenience.</p>
 +<div class="figure">
 +<img alt="../_images/ldap-settings-valid-oc45.png" src="../_images/ldap-settings-valid-oc45.png" />
 +<p class="caption">Success</p>
 +</div>
 +<p>In this case, Save the settings. You can check if the users and groups are
 +fetched correctly on the Settings → Users page.</p>
 +</div>
 +<div class="section" id="owncloud-avatar-integration">
 +<h2>ownCloud Avatar integration<a class="headerlink" href="#owncloud-avatar-integration" title="Permalink to this headline">¶</a></h2>
 +<p>ownCloud 6 incorporates a user profile picture feature, called Avatar. If a user
 +has a photo stored in the <em>jpegPhoto</em> or, since 6.0.2, <em>thumbnailPhoto</em>
 +attribute, it will be used as Avatar. The user then is not able to change his
 +avatar in the personal settings. It must be done within LDAP. <em>jpegPhoto</em> is
 +preferred over <em>thumbnailPhoto</em>.</p>
 +<div class="figure">
 +<img alt="../_images/ldap-fetched-avatar.png" src="../_images/ldap-fetched-avatar.png" />
 +<p class="caption">Profile picture fetched from LDAP, Personal Settings</p>
 +</div>
 +<p>If the <em>jpegPhoto</em> or <em>thumbnailPhoto</em> attribute is not set or empty, the
 +default ownCloud behaviour is active, i.e. the user will be able to set and
 +change his profile picture in the personal settings. If the user sets a profile
 +picture within ownCloud it will _not_ be stored in LDAP.</p>
 +<p>The <em>jpegPhoto</em> or <em>thumbnailPhoto</em> attribute will be fetched once a day to make
 +sure the current photo from LDAP is used in ownCloud. If a picture is added
 +later, a possibly set profile picture will be overridden with the LDAP one. If a
 +photo stored in the <em>jpegPhoto</em> and/or <em>thumbnailPhoto</em> attribute is deleted
 +later, the last profile picture in ownCloud will still be used.</p>
 +<p>The photo taken from LDAP will be adjusted to the requirements of the ownCloud
 +avatar automatically, i.e. it will be transformed into a square. If the photo
 +needs to be cut, it will be done equally from both affected sides. The original
 +photo stored in LDAP will stay the same, of course.</p>
 +</div>
 +<div class="section" id="troubleshooting-tips-and-tricks">
 +<h2>Troubleshooting, Tips and Tricks<a class="headerlink" href="#troubleshooting-tips-and-tricks" title="Permalink to this headline">¶</a></h2>
 +</div>
 +<div class="section" id="ssl-certificate-verification-ldaps-tls">
 +<h2>SSL Certificate Verification (LDAPS, TLS)<a class="headerlink" href="#ssl-certificate-verification-ldaps-tls" title="Permalink to this headline">¶</a></h2>
 +<p>A common mistake with SSL certificates is that they may not be known to PHP.
 +If you have trouble with certificate validation make sure that</p>
 +<ul class="simple">
 +<li>you have the certificate of the server installed on the ownCloud server</li>
 +<li>the certificate is announced in the system’s LDAP configuration file (usually
 +<em>/etc/ldap/ldap.conf</em> on Linux, <em>C:\openldap\sysconf\ldap.conf</em> or
 +<em>C:\ldap.conf</em> on Windows) using a <strong>TLS_CACERT /path/to/cert</strong> line.</li>
 +<li>Using LDAPS, also make sure that the port is correctly configured (by default
 +686)</li>
 +</ul>
 +</div>
 +<div class="section" id="microsoft-active-directory">
 +<h2>Microsoft Active Directory<a class="headerlink" href="#microsoft-active-directory" title="Permalink to this headline">¶</a></h2>
 +<p>Compared to earlier ownCloud versions, no further tweaks need to be done to
 +make ownCloud work with Active Directory. ownCloud will automatically find the
 +correct configuration in the wizard-like set up process.</p>
 +</div>
 +<div class="section" id="duplicating-server-configurations">
 +<h2>Duplicating Server Configurations<a class="headerlink" href="#duplicating-server-configurations" title="Permalink to this headline">¶</a></h2>
 +<p>In case you have a working configuration and want to create a similar one or
 +“snapshot” configurations before modifying them you can do the following:</p>
 +<ol class="arabic simple">
 +<li>Go to the <strong>Server</strong> tab</li>
 +<li>On <strong>Server Configuration</strong> choose <em>Add Server Configuration</em></li>
 +<li>Answer the question <em>Take over settings from recent server configuration?</em>
 +with <em>yes</em>.</li>
 +<li>(optional) Switch to <strong>Advanced</strong> tab and uncheck <strong>Configuration Active</strong>
 +in the <em>Connection Settings</em>, so the new configuration is not used on Save</li>
 +<li>Click on <strong>Save</strong></li>
 +</ol>
 +<p>Now you can modify the configuration and enable it if you wish.</p>
 +</div>
 +<div class="section" id="owncloud-ldap-internals">
 +<h2>ownCloud LDAP Internals<a class="headerlink" href="#owncloud-ldap-internals" title="Permalink to this headline">¶</a></h2>
 +<p>Some parts of how the LDAP backend works are described here. May it be helpful.</p>
 +</div>
 +<div class="section" id="groups">
 +<h2>Groups<a class="headerlink" href="#groups" title="Permalink to this headline">¶</a></h2>
 +<p>At the moment, only secondary groups are read. That means that only the groups
 +are retrieved, which are returned by the attribute auto-detected (or manually
 +chosen) in Group-Member association. Primary groups are not taken into
 +account.</p>
 +</div>
 +<div class="section" id="user-and-group-mapping">
 +<h2>User and Group Mapping<a class="headerlink" href="#user-and-group-mapping" title="Permalink to this headline">¶</a></h2>
 +<p>In ownCloud the user or group name is used to have all relevant information in
 +the database assigned. To work reliably a permanent internal user name and
 +group name is created and mapped to the LDAP DN and UUID. If the DN changes in
 +LDAP it will be detected, there will be no conflicts.</p>
 +<p>Those mappings are done in the database table ldap_user_mapping and
 +ldap_group_mapping. The user name is also used for the user’s folder (except
 +something else is specified in <em>User Home Folder Naming Rule</em>), which
 +contains files and meta data.</p>
 +<p>As of ownCloud 5 internal user name and a visible display name are separated.
 +This is not the case for group names, yet, i.e. group cannot be altered.</p>
 +<p>That means that your LDAP configuration should be good and ready before putting
 +it into production. The mapping tables are filled early, but as long as you are
 +testing, you can empty the tables any time. Do not do this in production. If you
 +want to rename a group, be very careful. Do not rename the user’s internal name.</p>
 +</div>
 +<div class="section" id="caching">
 +<h2>Caching<a class="headerlink" href="#caching" title="Permalink to this headline">¶</a></h2>
 +<p>For performance reasons a cache has been introduced to ownCloud. The cache stores
 +all users and groups, group memberships or internal userExists-requests. Since
 +ownCloud is written in PHP and each and every page request (also done by Ajax)
 +loads ownCloud and would execute one or more LDAP queries again, you do want to
 +have some of those queries cached and save those requests and traffic. It is
 +highly recommended to have the cache filled for a small amount of time, which
 +comes also very handy when using the sync client, as it is yet another request
 +for PHP.</p>
 +</div>
 +<div class="section" id="handling-with-backup-server">
 +<h2>Handling with Backup Server<a class="headerlink" href="#handling-with-backup-server" title="Permalink to this headline">¶</a></h2>
 +<p>When ownCloud is not able to contact the main server, it will be treated as
 +offline and no connection attempts will be done for the time specified in
 +<strong>Cache Time-To-Live</strong>. If a backup server is configured, it will be connected
 +instead. For planned downtime, check <strong>Disable Main Server</strong> for
 +the time being to avoid unnecessary connection attempts every now and then.</p>
 +</div>
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/configuration/background_jobs.html
index 6eef29d,0000000..18f4437
mode 100644,000000..100644
--- a/core/doc/admin/configuration/background_jobs.html
+++ b/core/doc/admin/configuration/background_jobs.html
@@@ -1,228 -1,0 +1,231 @@@
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>Background Jobs — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '../',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="../_static/jquery.js"></script>
 +    <script type="text/javascript" src="../_static/underscore.js"></script>
 +    <script type="text/javascript" src="../_static/doctools.js"></script>
 +    <script type="text/javascript" src="../_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
 +    <link rel="up" title="Configuration" href="index.html" />
 +    <link rel="next" title="Find Third-Party Libraries" href="configuration_3rdparty.html" />
 +    <link rel="prev" title="LDAP Authentication" href="auth_ldap.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="../contents.html">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
 +<ul class="current">
 +<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
 +<li class="toctree-l1 current"><a class="reference internal" href="index.html">Configuration</a><ul class="current">
 +<li class="toctree-l2"><a class="reference internal" href="configuration_apps.html">Managing Apps</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_users.html">User Management</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="auth_ldap.html">LDAP Authentication</a></li>
 +<li class="toctree-l2 current"><a class="current reference internal" href="">Background Jobs</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="#parameters">Parameters</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="#cron-jobs">Cron-Jobs</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_3rdparty.html">Find Third-Party Libraries</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_automation.html">Automatic Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_custom_clients.html">Customizing Client Download Links</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_database.html">MySQL/Postgres/SQLite Support</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_encryption.html">Using Server-Side Encryption</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_knowledgebase.html">Disable Knowledge Base</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_language.html">Setting the Default Language</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_logging.html">Configure Logging</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_mail.html">Sending Mail Notifications</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_maintenance.html">Enable Maintenance Mode</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_preview.html">Enabling File Previews</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_reverseproxy.html">Reverse Proxy Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html">Dealing with Big File Uploads</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="custom_mount_config_gui.html">Custom Mount Configuration Web-GUI</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="custom_mount_config.html">Custom Mount Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="custom_user_backend.html">Custom User Backend Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="xsendfile.html">Serving static files via web server</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l1"><a class="reference internal" href="../apps/index.html">Apps</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../sharing_api/index.html">Sharing API</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../config/index.html">The Configuration File</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <div class="section" id="background-jobs">
 +<h1>Background Jobs<a class="headerlink" href="#background-jobs" title="Permalink to this headline">¶</a></h1>
 +<p>A system like ownCloud sometimes requires tasks to be done on a regular
 +base without blocking the user interface. For that purpose you, as a system
 +administrator, can define background jobs which make it possible to execute
 +tasks without any need of user interaction, e.g. database clean-ups etc.
 +For the sake of completeness it is worth to know that additionally background
 +jobs can also be defined by installed apps.</p>
 +<div class="section" id="parameters">
 +<h2>Parameters<a class="headerlink" href="#parameters" title="Permalink to this headline">¶</a></h2>
 +<p>In the admin settings menu you can configure how cron-jobs should be executed.
 +You can choose between the following options:</p>
 +<ul class="simple">
 +<li>AJAX</li>
 +<li>Webcron</li>
 +<li>Cron</li>
 +</ul>
 +</div>
 +<div class="section" id="cron-jobs">
 +<h2>Cron-Jobs<a class="headerlink" href="#cron-jobs" title="Permalink to this headline">¶</a></h2>
 +<p>OwnCloud requires various automated background jobs to be run. There are three methods to achieve this.
 +The default way is AJAX and the recommended way is cron.</p>
 +<div class="section" id="ajax">
 +<h3>AJAX<a class="headerlink" href="#ajax" title="Permalink to this headline">¶</a></h3>
 +<p>This option is the default option, although it is the least reliable. Every
 +time a user visits the ownCloud page a single background job will be executed.
 +The advantage of this mechanism is, that is does not require access to the
 +system nor registration at a third party service.
 +The disadvantage of this solution compared to the Webcron service is, that it
 +requires regular visits of the page to get triggered.</p>
 +</div>
 +<div class="section" id="webcron">
 +<h3>Webcron<a class="headerlink" href="#webcron" title="Permalink to this headline">¶</a></h3>
 +<p>By registering your ownCloud <tt class="docutils literal"><span class="pre">cron.php</span></tt> script address at an external webcron
 +service, like e.g. <a class="reference external" href="http://www.easycron.com/">easyCron</a>, you ensure that background jobs will be executed
 +regularly. To use such a service your server need to be reachable via the Internet.</p>
 +<p><strong>Example</strong></p>
 +<div class="highlight-python"><pre>URL to call: http[s]://<domain-of-your-server>/owncloud/cron.php</pre>
 +</div>
 +</div>
 +<div class="section" id="cron">
 +<h3>Cron<a class="headerlink" href="#cron" title="Permalink to this headline">¶</a></h3>
 +<p>Using the systems cron feature is the preferred way to run regular tasks,
 +because it allows to execute jobs without the limitations which a web server
 +may have.</p>
 +<p><strong>Example</strong></p>
 +<p>To run a cron job on a *nix system, e.g. every 15min, under the default web server
 +user, e.g. <strong>www-data</strong>, you need to set-up the following cron job to call the
 +<strong>cron.php</strong> script. Please check the crontab man page for the exact command syntax.</p>
 +<div class="highlight-python"><pre># crontab -u www-data -e
 +*/15  *  *  *  * php -f /var/www/owncloud/cron.php</pre>
 +</div>
 +</div>
 +</div>
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/configuration/configuration_3rdparty.html
index 8086d9c,0000000..0d425bb
mode 100644,000000..100644
--- a/core/doc/admin/configuration/configuration_3rdparty.html
+++ b/core/doc/admin/configuration/configuration_3rdparty.html
@@@ -1,190 -1,0 +1,193 @@@
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>Find Third-Party Libraries — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '../',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="../_static/jquery.js"></script>
 +    <script type="text/javascript" src="../_static/underscore.js"></script>
 +    <script type="text/javascript" src="../_static/doctools.js"></script>
 +    <script type="text/javascript" src="../_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
 +    <link rel="up" title="Configuration" href="index.html" />
 +    <link rel="next" title="Automatic Configuration" href="configuration_automation.html" />
 +    <link rel="prev" title="Background Jobs" href="background_jobs.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="../contents.html">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
 +<ul class="current">
 +<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
 +<li class="toctree-l1 current"><a class="reference internal" href="index.html">Configuration</a><ul class="current">
 +<li class="toctree-l2"><a class="reference internal" href="configuration_apps.html">Managing Apps</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_users.html">User Management</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="auth_ldap.html">LDAP Authentication</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="background_jobs.html">Background Jobs</a></li>
 +<li class="toctree-l2 current"><a class="current reference internal" href="">Find Third-Party Libraries</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="#parameters">Parameters</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_automation.html">Automatic Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_custom_clients.html">Customizing Client Download Links</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_database.html">MySQL/Postgres/SQLite Support</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_encryption.html">Using Server-Side Encryption</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_knowledgebase.html">Disable Knowledge Base</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_language.html">Setting the Default Language</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_logging.html">Configure Logging</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_mail.html">Sending Mail Notifications</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_maintenance.html">Enable Maintenance Mode</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_preview.html">Enabling File Previews</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_reverseproxy.html">Reverse Proxy Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html">Dealing with Big File Uploads</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="custom_mount_config_gui.html">Custom Mount Configuration Web-GUI</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="custom_mount_config.html">Custom Mount Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="custom_user_backend.html">Custom User Backend Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="xsendfile.html">Serving static files via web server</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l1"><a class="reference internal" href="../apps/index.html">Apps</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../sharing_api/index.html">Sharing API</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../config/index.html">The Configuration File</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <div class="section" id="find-third-party-libraries">
 +<h1>Find Third-Party Libraries<a class="headerlink" href="#find-third-party-libraries" title="Permalink to this headline">¶</a></h1>
 +<p>ownCloud resorts to some 3rd-party PHP components to provide its functionality.
 +These components are part of the software package and are usually shipped in
 +the <strong>/3rdparty</strong> folder.</p>
 +<div class="section" id="parameters">
 +<h2>Parameters<a class="headerlink" href="#parameters" title="Permalink to this headline">¶</a></h2>
 +<p>If you want to change the default location of the 3rd-party folder you can use the <strong>3rdpartyroot</strong> parameter to define
 +the absolute file system path to the folder. The <strong>3rdpartyurl</strong> parameter is used to define the http web path to that
 +folder, starting at the ownCloud web root.</p>
 +<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
 +
 +<span class="s2">"3rdpartyroot"</span> <span class="o">=></span> <span class="nx">OC</span><span class="o">::</span><span class="nv">$SERVERROOT</span><span class="o">.</span><span class="s2">"/3rdparty"</span><span class="p">,</span>
 +<span class="s2">"3rdpartyurl"</span>  <span class="o">=></span> <span class="s2">"/3rdparty"</span><span class="p">,</span>
 +</pre></div>
 +</div>
 +</div>
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/configuration/configuration_apps.html
index 7901d28,0000000..2103b24
mode 100644,000000..100644
--- a/core/doc/admin/configuration/configuration_apps.html
+++ b/core/doc/admin/configuration/configuration_apps.html
@@@ -1,248 -1,0 +1,251 @@@
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>Managing Apps — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '../',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="../_static/jquery.js"></script>
 +    <script type="text/javascript" src="../_static/underscore.js"></script>
 +    <script type="text/javascript" src="../_static/doctools.js"></script>
 +    <script type="text/javascript" src="../_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
 +    <link rel="up" title="Configuration" href="index.html" />
 +    <link rel="next" title="User Management" href="configuration_users.html" />
 +    <link rel="prev" title="Configuration" href="index.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="../contents.html">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
 +<ul class="current">
 +<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
 +<li class="toctree-l1 current"><a class="reference internal" href="index.html">Configuration</a><ul class="current">
 +<li class="toctree-l2 current"><a class="current reference internal" href="">Managing Apps</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="#parameters">Parameters</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_users.html">User Management</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="auth_ldap.html">LDAP Authentication</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="background_jobs.html">Background Jobs</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_3rdparty.html">Find Third-Party Libraries</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_automation.html">Automatic Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_custom_clients.html">Customizing Client Download Links</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_database.html">MySQL/Postgres/SQLite Support</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_encryption.html">Using Server-Side Encryption</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_knowledgebase.html">Disable Knowledge Base</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_language.html">Setting the Default Language</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_logging.html">Configure Logging</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_mail.html">Sending Mail Notifications</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_maintenance.html">Enable Maintenance Mode</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_preview.html">Enabling File Previews</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_reverseproxy.html">Reverse Proxy Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html">Dealing with Big File Uploads</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="custom_mount_config_gui.html">Custom Mount Configuration Web-GUI</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="custom_mount_config.html">Custom Mount Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="custom_user_backend.html">Custom User Backend Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="xsendfile.html">Serving static files via web server</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l1"><a class="reference internal" href="../apps/index.html">Apps</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../sharing_api/index.html">Sharing API</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../config/index.html">The Configuration File</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <div class="section" id="managing-apps">
 +<h1>Managing Apps<a class="headerlink" href="#managing-apps" title="Permalink to this headline">¶</a></h1>
 +<p>After you have installed ownCloud, you might realize that it would be nice to
 +provide an additional function on top of the core functionality in your ownCloud installation.</p>
 +<p>With ownCloud installation, you will find some apps enabled by default. To see which applications
 +are enabled, click on Apps button on the web interface navigation to go into applications page:</p>
 +<div class="figure">
 +<img alt="../_images/oc_admin_app_page.png" src="../_images/oc_admin_app_page.png" />
 +</div>
 +<p>Administrator application page</p>
 +<p>In this page, you can enable or disable applications simply by clicking on their names.
 +Enabled applications will be shown in <strong>bold</strong> while disabled ones will be shown in normal font.
 +If the app is not developed by ownCloud, it will have the <em>3rd party</em> notice next to it. To see what an
 +application does, clicking on its name will show a description on the right side of the same page.</p>
 +<p>To install new apps, you can use <em>More apps</em> button or check out the <a class="reference external" href="http://apps.owncloud.com/">ownCloud apps store</a>.
 +There you will find a lot of ready-to-use apps provided by the ownCloud community.</p>
 +<p>If you would like to add your own app, please use <em>Add your App...</em> button on the same page. This will redirect you to
 +our <a class="reference external" href="http://owncloud.org/dev">Developer Center</a>.</p>
 +<div class="section" id="parameters">
 +<h2>Parameters<a class="headerlink" href="#parameters" title="Permalink to this headline">¶</a></h2>
 +<p>Parameters are set in the <tt class="file docutils literal"><span class="pre">config/config.php</span></tt> inside the <strong>$CONFIG</strong> array.</p>
 +<div class="section" id="use-custom-app-directories">
 +<h3>Use custom app directories<a class="headerlink" href="#use-custom-app-directories" title="Permalink to this headline">¶</a></h3>
 +<p>Use the <strong>apps_paths</strong> array to set the apps folders which should be scanned
 +for available apps and/or where user specific apps should be installed.The key
 +<strong>path</strong> defines the absolute file system path to the app folder. The key
 +<strong>url</strong> defines the http web path to that folder, starting at the ownCloud
 +web root. The key <strong>writable</strong> indicates if a user can install apps in that
 +folder.</p>
 +<div class="admonition note">
 +<p class="first admonition-title">Note</p>
 +<p class="last">If you want to make sure that the default <strong>/apps/</strong> folder only contains apps shipped with ownCloud, you
 +should follow the example and set-up a <strong>/apps2/</strong> folder which will be used to store all apps downloaded by users</p>
 +</div>
 +<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
 +
 +  <span class="s2">"apps_paths"</span> <span class="o">=></span> <span class="k">array</span> <span class="p">(</span>
 +      <span class="mi">0</span> <span class="o">=></span> <span class="k">array</span> <span class="p">(</span>
 +              <span class="s2">"path"</span>     <span class="o">=></span> <span class="nx">OC</span><span class="o">::</span><span class="nv">$SERVERROOT</span><span class="o">.</span><span class="s2">"/apps"</span><span class="p">,</span>
 +              <span class="s2">"url"</span>      <span class="o">=></span> <span class="s2">"/apps"</span><span class="p">,</span>
 +              <span class="s2">"writable"</span> <span class="o">=></span> <span class="k">false</span><span class="p">,</span>
 +      <span class="p">),</span>
 +      <span class="mi">1</span> <span class="o">=></span> <span class="k">array</span> <span class="p">(</span>
 +              <span class="s2">"path"</span>     <span class="o">=></span> <span class="nx">OC</span><span class="o">::</span><span class="nv">$SERVERROOT</span><span class="o">.</span><span class="s2">"/apps2"</span><span class="p">,</span>
 +              <span class="s2">"url"</span>      <span class="o">=></span> <span class="s2">"/apps2"</span><span class="p">,</span>
 +              <span class="s2">"writable"</span> <span class="o">=></span> <span class="k">true</span><span class="p">,</span>
 +      <span class="p">),</span>
 +  <span class="p">),</span>
 +</pre></div>
 +</div>
 +</div>
 +<div class="section" id="use-your-own-appstore">
 +<h3>Use your own appstore<a class="headerlink" href="#use-your-own-appstore" title="Permalink to this headline">¶</a></h3>
 +<p>If you want to allow the installation of apps from the apps store you have to
 +set <strong>appstoreenabled</strong> parameter, but this can only be done if at least one
 +of the configured apps directories is writable.</p>
 +<p>The <strong>appstoreurl</strong> is used to set the http path to the ownCloud apps store. The appstore server has to use <abbr title="Open Collaboration Services">OCS</abbr>.</p>
 +<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
 +
 +  <span class="s2">"appstoreenabled"</span> <span class="o">=></span> <span class="k">true</span><span class="p">,</span>
 +  <span class="s2">"appstoreurl"</span> <span class="o">=></span> <span class="s2">"http://api.apps.owncloud.com/v1"</span><span class="p">,</span>
 +</pre></div>
 +</div>
 +</div>
 +<div class="section" id="guard-against-malicious-3rdparty-code">
 +<h3>Guard against malicious 3rdparty code<a class="headerlink" href="#guard-against-malicious-3rdparty-code" title="Permalink to this headline">¶</a></h3>
 +<p>Finally you can enable checks for malicious code fragments of 3rd-party apps
 +by setting the <strong>appcodechecker</strong> parameter.</p>
 +<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
 +
 +  <span class="s2">"appcodechecker"</span> <span class="o">=></span> <span class="k">false</span><span class="p">,</span>
 +</pre></div>
 +</div>
 +</div>
 +</div>
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/configuration/configuration_automation.html
index 059e417,0000000..37dae91
mode 100644,000000..100644
--- a/core/doc/admin/configuration/configuration_automation.html
+++ b/core/doc/admin/configuration/configuration_automation.html
@@@ -1,287 -1,0 +1,290 @@@
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>Automatic Configuration — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '../',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="../_static/jquery.js"></script>
 +    <script type="text/javascript" src="../_static/underscore.js"></script>
 +    <script type="text/javascript" src="../_static/doctools.js"></script>
 +    <script type="text/javascript" src="../_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
 +    <link rel="up" title="Configuration" href="index.html" />
 +    <link rel="next" title="Customizing Client Download Links" href="configuration_custom_clients.html" />
 +    <link rel="prev" title="Find Third-Party Libraries" href="configuration_3rdparty.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="../contents.html">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
 +<ul class="current">
 +<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
 +<li class="toctree-l1 current"><a class="reference internal" href="index.html">Configuration</a><ul class="current">
 +<li class="toctree-l2"><a class="reference internal" href="configuration_apps.html">Managing Apps</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_users.html">User Management</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="auth_ldap.html">LDAP Authentication</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="background_jobs.html">Background Jobs</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_3rdparty.html">Find Third-Party Libraries</a></li>
 +<li class="toctree-l2 current"><a class="current reference internal" href="">Automatic Configuration</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="#parameters">Parameters</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="#sample-automatic-configurations">Sample Automatic Configurations</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_custom_clients.html">Customizing Client Download Links</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_database.html">MySQL/Postgres/SQLite Support</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_encryption.html">Using Server-Side Encryption</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_knowledgebase.html">Disable Knowledge Base</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_language.html">Setting the Default Language</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_logging.html">Configure Logging</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_mail.html">Sending Mail Notifications</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_maintenance.html">Enable Maintenance Mode</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_preview.html">Enabling File Previews</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_reverseproxy.html">Reverse Proxy Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html">Dealing with Big File Uploads</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="custom_mount_config_gui.html">Custom Mount Configuration Web-GUI</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="custom_mount_config.html">Custom Mount Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="custom_user_backend.html">Custom User Backend Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="xsendfile.html">Serving static files via web server</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l1"><a class="reference internal" href="../apps/index.html">Apps</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../sharing_api/index.html">Sharing API</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../config/index.html">The Configuration File</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <div class="section" id="automatic-configuration">
 +<h1>Automatic Configuration<a class="headerlink" href="#automatic-configuration" title="Permalink to this headline">¶</a></h1>
 +<p>If you need to install ownCloud on multiple servers you normally do not want
 +to set-up each instance separately as described in the <a class="reference internal" href="configuration_database.html"><em>MySQL/Postgres/SQLite Support</em></a>.
 +For this reason the automatic configuration feature has been introduced.</p>
 +<p>To take advantage of this feature you need to create a configuration file, called
 +<tt class="file docutils literal"><span class="pre">../owncloud/config/autoconfig.php</span></tt> and set the parameters as required.
 +You can provide all parameters or just part of them - parameters which haven’t been provided (if any) will be asked
 +at “Finish setup” screen at first run of ownCloud.</p>
 +<p>The <tt class="file docutils literal"><span class="pre">../owncloud/config/autoconfig.php</span></tt> will be automatically removed after the initial configuration has been applied.</p>
 +<div class="section" id="parameters">
 +<h2>Parameters<a class="headerlink" href="#parameters" title="Permalink to this headline">¶</a></h2>
 +<p>You need to keep in mind that two parameters are named differently in this
 +configuration file compared to the normal <tt class="file docutils literal"><span class="pre">config.php</span></tt>.</p>
 +<table border="1" class="docutils">
 +<colgroup>
 +<col width="52%" />
 +<col width="48%" />
 +</colgroup>
 +<thead valign="bottom">
 +<tr class="row-odd"><th class="head">autoconfig.php</th>
 +<th class="head">config.php</th>
 +</tr>
 +</thead>
 +<tbody valign="top">
 +<tr class="row-even"><td>directory</td>
 +<td>datadirectory</td>
 +</tr>
 +<tr class="row-odd"><td>dbpass</td>
 +<td>dbpassword</td>
 +</tr>
 +</tbody>
 +</table>
 +</div>
 +<div class="section" id="sample-automatic-configurations">
 +<h2>Sample Automatic Configurations<a class="headerlink" href="#sample-automatic-configurations" title="Permalink to this headline">¶</a></h2>
 +<div class="section" id="data-directory">
 +<h3>Data Directory<a class="headerlink" href="#data-directory" title="Permalink to this headline">¶</a></h3>
 +<p>With the configuration below the “Finish setup” screen still will ask for database and admin credentials settings.</p>
 +<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
 +<span class="nv">$AUTOCONFIG</span> <span class="o">=</span> <span class="k">array</span><span class="p">(</span>
 +  <span class="s2">"directory"</span>     <span class="o">=></span> <span class="s2">"/www/htdocs/owncloud/data"</span><span class="p">,</span>
 +<span class="p">);</span>
 +</pre></div>
 +</div>
 +</div>
 +<div class="section" id="sqlite-database">
 +<h3>SQLite Database<a class="headerlink" href="#sqlite-database" title="Permalink to this headline">¶</a></h3>
 +<p>With the configuration below the “Finish setup” screen still will ask for data directory and admin credentials settings.</p>
 +<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
 +<span class="nv">$AUTOCONFIG</span> <span class="o">=</span> <span class="k">array</span><span class="p">(</span>
 +  <span class="s2">"dbtype"</span>        <span class="o">=></span> <span class="s2">"sqlite"</span><span class="p">,</span>
 +  <span class="s2">"dbname"</span>        <span class="o">=></span> <span class="s2">"owncloud"</span><span class="p">,</span>
 +  <span class="s2">"dbtableprefix"</span> <span class="o">=></span> <span class="s2">""</span><span class="p">,</span>
 +<span class="p">);</span>
 +</pre></div>
 +</div>
 +</div>
 +<div class="section" id="mysql-database">
 +<h3>MySQL Database<a class="headerlink" href="#mysql-database" title="Permalink to this headline">¶</a></h3>
 +<p>Keep in mind that the automatic configuration does not unburden you from creating the database user and database
 +in advance, as described in <a class="reference internal" href="configuration_database.html"><em>MySQL/Postgres/SQLite Support</em></a>.</p>
 +<p>With the configuration below the “Finish setup” screen still will ask for data directory and admin credentials settings.</p>
 +<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
 +<span class="nv">$AUTOCONFIG</span> <span class="o">=</span> <span class="k">array</span><span class="p">(</span>
 +  <span class="s2">"dbtype"</span>        <span class="o">=></span> <span class="s2">"mysql"</span><span class="p">,</span>
 +  <span class="s2">"dbname"</span>        <span class="o">=></span> <span class="s2">"owncloud"</span><span class="p">,</span>
 +  <span class="s2">"dbuser"</span>        <span class="o">=></span> <span class="s2">"username"</span><span class="p">,</span>
 +  <span class="s2">"dbpass"</span>        <span class="o">=></span> <span class="s2">"password"</span><span class="p">,</span>
 +  <span class="s2">"dbhost"</span>        <span class="o">=></span> <span class="s2">"localhost"</span><span class="p">,</span>
 +  <span class="s2">"dbtableprefix"</span> <span class="o">=></span> <span class="s2">""</span><span class="p">,</span>
 +<span class="p">);</span>
 +</pre></div>
 +</div>
 +</div>
 +<div class="section" id="postgresql-database">
 +<h3>PostgreSQL Database<a class="headerlink" href="#postgresql-database" title="Permalink to this headline">¶</a></h3>
 +<p>Keep in mind that the automatic configuration does not unburden you from creating the database user and database
 +in advance, as described in <a class="reference internal" href="configuration_database.html"><em>MySQL/Postgres/SQLite Support</em></a>.</p>
 +<p>With the configuration below the “Finish setup” screen still will ask for data directory and admin credentials settings.</p>
 +<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
 +<span class="nv">$AUTOCONFIG</span> <span class="o">=</span> <span class="k">array</span><span class="p">(</span>
 +  <span class="s2">"dbtype"</span>        <span class="o">=></span> <span class="s2">"pgsql"</span><span class="p">,</span>
 +  <span class="s2">"dbname"</span>        <span class="o">=></span> <span class="s2">"owncloud"</span><span class="p">,</span>
 +  <span class="s2">"dbuser"</span>        <span class="o">=></span> <span class="s2">"username"</span><span class="p">,</span>
 +  <span class="s2">"dbpass"</span>        <span class="o">=></span> <span class="s2">"password"</span><span class="p">,</span>
 +  <span class="s2">"dbhost"</span>        <span class="o">=></span> <span class="s2">"localhost"</span><span class="p">,</span>
 +  <span class="s2">"dbtableprefix"</span> <span class="o">=></span> <span class="s2">""</span><span class="p">,</span>
 +<span class="p">);</span>
 +</pre></div>
 +</div>
 +</div>
 +<div class="section" id="all-parameters">
 +<h3>All Parameters<a class="headerlink" href="#all-parameters" title="Permalink to this headline">¶</a></h3>
 +<p>Keep in mind that the automatic configuration does not unburden you from creating the database user and database
 +in advance, as described in <a class="reference internal" href="configuration_database.html"><em>MySQL/Postgres/SQLite Support</em></a>.</p>
 +<p>With the configuration below “Finish setup” will be skipped at first ownCloud run since all parameters are already preconfigured.</p>
 +<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
 +<span class="nv">$AUTOCONFIG</span> <span class="o">=</span> <span class="k">array</span><span class="p">(</span>
 +  <span class="s2">"dbtype"</span>        <span class="o">=></span> <span class="s2">"mysql"</span><span class="p">,</span>
 +  <span class="s2">"dbname"</span>        <span class="o">=></span> <span class="s2">"owncloud"</span><span class="p">,</span>
 +  <span class="s2">"dbuser"</span>        <span class="o">=></span> <span class="s2">"username"</span><span class="p">,</span>
 +  <span class="s2">"dbpass"</span>        <span class="o">=></span> <span class="s2">"password"</span><span class="p">,</span>
 +  <span class="s2">"dbhost"</span>        <span class="o">=></span> <span class="s2">"localhost"</span><span class="p">,</span>
 +  <span class="s2">"dbtableprefix"</span> <span class="o">=></span> <span class="s2">""</span><span class="p">,</span>
 +  <span class="s2">"adminlogin"</span>    <span class="o">=></span> <span class="s2">"root"</span><span class="p">,</span>
 +  <span class="s2">"adminpass"</span>     <span class="o">=></span> <span class="s2">"root-password"</span><span class="p">,</span>
 +  <span class="s2">"directory"</span>     <span class="o">=></span> <span class="s2">"/www/htdocs/owncloud/data"</span><span class="p">,</span>
 +<span class="p">);</span>
 +</pre></div>
 +</div>
 +</div>
 +</div>
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/configuration/configuration_custom_clients.html
index 8f1b43b,0000000..5c0fd4d
mode 100644,000000..100644
--- a/core/doc/admin/configuration/configuration_custom_clients.html
+++ b/core/doc/admin/configuration/configuration_custom_clients.html
@@@ -1,197 -1,0 +1,200 @@@
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>Customizing Client Download Links — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '../',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="../_static/jquery.js"></script>
 +    <script type="text/javascript" src="../_static/underscore.js"></script>
 +    <script type="text/javascript" src="../_static/doctools.js"></script>
 +    <script type="text/javascript" src="../_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
 +    <link rel="up" title="Configuration" href="index.html" />
 +    <link rel="next" title="MySQL/Postgres/SQLite Support" href="configuration_database.html" />
 +    <link rel="prev" title="Automatic Configuration" href="configuration_automation.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="../contents.html">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
 +<ul class="current">
 +<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
 +<li class="toctree-l1 current"><a class="reference internal" href="index.html">Configuration</a><ul class="current">
 +<li class="toctree-l2"><a class="reference internal" href="configuration_apps.html">Managing Apps</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_users.html">User Management</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="auth_ldap.html">LDAP Authentication</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="background_jobs.html">Background Jobs</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_3rdparty.html">Find Third-Party Libraries</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_automation.html">Automatic Configuration</a></li>
 +<li class="toctree-l2 current"><a class="current reference internal" href="">Customizing Client Download Links</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="#parameters">Parameters</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_database.html">MySQL/Postgres/SQLite Support</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_encryption.html">Using Server-Side Encryption</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_knowledgebase.html">Disable Knowledge Base</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_language.html">Setting the Default Language</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_logging.html">Configure Logging</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_mail.html">Sending Mail Notifications</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_maintenance.html">Enable Maintenance Mode</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_preview.html">Enabling File Previews</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_reverseproxy.html">Reverse Proxy Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html">Dealing with Big File Uploads</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="custom_mount_config_gui.html">Custom Mount Configuration Web-GUI</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="custom_mount_config.html">Custom Mount Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="custom_user_backend.html">Custom User Backend Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="xsendfile.html">Serving static files via web server</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l1"><a class="reference internal" href="../apps/index.html">Apps</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../sharing_api/index.html">Sharing API</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../config/index.html">The Configuration File</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <div class="section" id="customizing-client-download-links">
 +<h1>Customizing Client Download Links<a class="headerlink" href="#customizing-client-download-links" title="Permalink to this headline">¶</a></h1>
 +<p>If you want to access your ownCloud, you can choose between the standard Web-GUI
 +and different client sync applications. Download links which point to these
 +applications are shown at the top of the personal menu. The following sync
 +applications are currently available out of the box:</p>
 +<ul class="simple">
 +<li>Desktop sync clients for Windows, Max and Linux OS</li>
 +<li>Mobile sync client for Android devices</li>
 +<li>Mobile sync client for iOS devices</li>
 +</ul>
 +<div class="section" id="parameters">
 +<h2>Parameters<a class="headerlink" href="#parameters" title="Permalink to this headline">¶</a></h2>
 +<p>If you want to customize the download links for the sync clients the following
 +parameters need to be modified to fulfil your requirements:</p>
 +<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
 +
 +  <span class="s2">"customclient_desktop"</span> <span class="o">=></span> <span class="s2">"http://owncloud.org/sync-clients/"</span><span class="p">,</span>
 +  <span class="s2">"customclient_android"</span> <span class="o">=></span> <span class="s2">"https://play.google.com/store/apps/details?id=com.owncloud.android"</span><span class="p">,</span>
 +  <span class="s2">"customclient_ios"</span>     <span class="o">=></span> <span class="s2">"https://itunes.apple.com/us/app/owncloud/id543672169?mt=8"</span><span class="p">,</span>
 +</pre></div>
 +</div>
 +<p>This parameters can be set in the <tt class="file docutils literal"><span class="pre">config/config.php</span></tt></p>
 +</div>
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/configuration/configuration_database.html
index a751f17,0000000..60f529b
mode 100644,000000..100644
--- a/core/doc/admin/configuration/configuration_database.html
+++ b/core/doc/admin/configuration/configuration_database.html
@@@ -1,487 -1,0 +1,490 @@@
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>MySQL/Postgres/SQLite Support — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '../',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="../_static/jquery.js"></script>
 +    <script type="text/javascript" src="../_static/underscore.js"></script>
 +    <script type="text/javascript" src="../_static/doctools.js"></script>
 +    <script type="text/javascript" src="../_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
 +    <link rel="up" title="Configuration" href="index.html" />
 +    <link rel="next" title="Using Server-Side Encryption" href="configuration_encryption.html" />
 +    <link rel="prev" title="Customizing Client Download Links" href="configuration_custom_clients.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="../contents.html">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
 +<ul class="current">
 +<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
 +<li class="toctree-l1 current"><a class="reference internal" href="index.html">Configuration</a><ul class="current">
 +<li class="toctree-l2"><a class="reference internal" href="configuration_apps.html">Managing Apps</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_users.html">User Management</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="auth_ldap.html">LDAP Authentication</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="background_jobs.html">Background Jobs</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_3rdparty.html">Find Third-Party Libraries</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_automation.html">Automatic Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_custom_clients.html">Customizing Client Download Links</a></li>
 +<li class="toctree-l2 current"><a class="current reference internal" href="">MySQL/Postgres/SQLite Support</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="#requirements">Requirements</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="#parameters">Parameters</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="#trouble-shooting">Trouble Shooting</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_encryption.html">Using Server-Side Encryption</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_knowledgebase.html">Disable Knowledge Base</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_language.html">Setting the Default Language</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_logging.html">Configure Logging</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_mail.html">Sending Mail Notifications</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_maintenance.html">Enable Maintenance Mode</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_preview.html">Enabling File Previews</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_reverseproxy.html">Reverse Proxy Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html">Dealing with Big File Uploads</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="custom_mount_config_gui.html">Custom Mount Configuration Web-GUI</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="custom_mount_config.html">Custom Mount Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="custom_user_backend.html">Custom User Backend Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="xsendfile.html">Serving static files via web server</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l1"><a class="reference internal" href="../apps/index.html">Apps</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../sharing_api/index.html">Sharing API</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../config/index.html">The Configuration File</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <div class="section" id="mysql-postgres-sqlite-support">
 +<h1>MySQL/Postgres/SQLite Support<a class="headerlink" href="#mysql-postgres-sqlite-support" title="Permalink to this headline">¶</a></h1>
 +<p>ownCloud requires a database where administrative data will be held. Four different database types are currently
 +supported, <a class="reference external" href="http://www.mysql.com/">MySQL</a>, <a class="reference external" href="https://mariadb.org/">MariaDB</a>, <a class="reference external" href="http://www.sqlite.org/">SQLite</a>,
 +and <a class="reference external" href="http://www.postgresql.org/">PostgreSQL</a>. MySQL or MariaDB are the recommended database engines. By default
 +SQLite is chosen because it is a file based database with the least administrative overhead.</p>
 +<div class="admonition note">
 +<p class="first admonition-title">Note</p>
 +<p class="last">Because SQLite handles multiple users very badly SQLite is only recommended for single user ownCloud installations</p>
 +</div>
 +<div class="section" id="requirements">
 +<h2>Requirements<a class="headerlink" href="#requirements" title="Permalink to this headline">¶</a></h2>
 +<p>If you decide to use MySQL, MariaDB, or PostgreSQL you need to install and set-up the
 +database first. These steps will not be covered by this description as they are easy to find elsewhere.</p>
 +</div>
 +<div class="section" id="parameters">
 +<h2>Parameters<a class="headerlink" href="#parameters" title="Permalink to this headline">¶</a></h2>
 +<div class="section" id="mysql-mariadb-database">
 +<h3>MySQL/MariaDB Database<a class="headerlink" href="#mysql-mariadb-database" title="Permalink to this headline">¶</a></h3>
 +<p>If you decide to use a MySQL or MariaDB database make sure that you have installed and
 +enabled the MySQL extension in PHP and that the <strong>mysql.default_socket</strong>
 +points to the correct socket (if the database runs on same server as ownCloud).</p>
 +<p>Please note that MariaDB is backwards compatible with MySQL, so all instructions will work for both.
 +You will not need to replace mysql with anything.</p>
 +<p>The PHP configuration in <tt class="file docutils literal"><span class="pre">/etc/php5/conf.d/mysql.ini</span></tt> could look like this:</p>
 +<div class="highlight-ini"><div class="highlight"><pre><span class="c"># configuration for PHP MySQL module</span>
 +<span class="na">extension</span><span class="o">=</span><span class="s">pdo_mysql.so</span>
 +<span class="na">extension</span><span class="o">=</span><span class="s">mysql.so</span>
 +
 +<span class="k">[mysql]</span>
 +<span class="na">mysql.allow_local_infile</span><span class="o">=</span><span class="s">On</span>
 +<span class="na">mysql.allow_persistent</span><span class="o">=</span><span class="s">On</span>
 +<span class="na">mysql.cache_size</span><span class="o">=</span><span class="s">2000</span>
 +<span class="na">mysql.max_persistent</span><span class="o">=</span><span class="s">-1</span>
 +<span class="na">mysql.max_links</span><span class="o">=</span><span class="s">-1</span>
 +<span class="na">mysql.default_port</span><span class="o">=</span>
 +<span class="na">mysql.default_socket</span><span class="o">=</span><span class="s">/var/lib/mysql/mysql.sock  # Debian squeeze: /var/run/mysqld/mysqld.sock</span>
 +<span class="na">mysql.default_host</span><span class="o">=</span>
 +<span class="na">mysql.default_user</span><span class="o">=</span>
 +<span class="na">mysql.default_password</span><span class="o">=</span>
 +<span class="na">mysql.connect_timeout</span><span class="o">=</span><span class="s">60</span>
 +<span class="na">mysql.trace_mode</span><span class="o">=</span><span class="s">Off</span>
 +</pre></div>
 +</div>
 +<p>Now you need to create a database user and the database itself by using the
 +MySQL command line interface. The database tables will be created by ownCloud
 +when you login for the first time.</p>
 +<p>To start the MySQL command line mode use:</p>
 +<div class="highlight-python"><div class="highlight"><pre><span class="n">mysql</span> <span class="o">-</span><span class="n">uroot</span> <span class="o">-</span><span class="n">p</span>
 +</pre></div>
 +</div>
 +<p>Then a <strong>mysql></strong> or <strong>MariaDB [root]></strong> prompt will appear. Now enter the following lines and confirm them with the enter key:</p>
 +<div class="highlight-sql"><div class="highlight"><pre><span class="k">CREATE</span> <span class="k">USER</span> <span class="s1">'username'</span><span class="o">@</span><span class="s1">'localhost'</span> <span class="n">IDENTIFIED</span> <span class="k">BY</span> <span class="s1">'password'</span><span class="p">;</span>
 +<span class="k">CREATE</span> <span class="k">DATABASE</span> <span class="n">IF</span> <span class="k">NOT</span> <span class="k">EXISTS</span> <span class="n">owncloud</span><span class="p">;</span>
 +<span class="k">GRANT</span> <span class="k">ALL</span> <span class="k">PRIVILEGES</span> <span class="k">ON</span> <span class="n">owncloud</span><span class="p">.</span><span class="o">*</span> <span class="k">TO</span> <span class="s1">'username'</span><span class="o">@</span><span class="s1">'localhost'</span> <span class="n">IDENTIFIED</span> <span class="k">BY</span> <span class="s1">'password'</span><span class="p">;</span>
 +</pre></div>
 +</div>
 +<p>You can quit the prompt by entering:</p>
 +<div class="highlight-python"><div class="highlight"><pre><span class="n">quit</span>
 +</pre></div>
 +</div>
 +<p>In the ownCloud configuration you need to set the hostname on which the
 +database is running and a valid username and password to access it.</p>
 +<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
 +
 +  <span class="s2">"dbtype"</span>        <span class="o">=></span> <span class="s2">"mysql"</span><span class="p">,</span>
 +  <span class="s2">"dbname"</span>        <span class="o">=></span> <span class="s2">"owncloud"</span><span class="p">,</span>
 +  <span class="s2">"dbuser"</span>        <span class="o">=></span> <span class="s2">"username"</span><span class="p">,</span>
 +  <span class="s2">"dbpassword"</span>    <span class="o">=></span> <span class="s2">"password"</span><span class="p">,</span>
 +  <span class="s2">"dbhost"</span>        <span class="o">=></span> <span class="s2">"localhost"</span><span class="p">,</span>
 +  <span class="s2">"dbtableprefix"</span> <span class="o">=></span> <span class="s2">""</span><span class="p">,</span>
 +</pre></div>
 +</div>
 +</div>
 +<div class="section" id="sqlite-database">
 +<h3>SQLite Database<a class="headerlink" href="#sqlite-database" title="Permalink to this headline">¶</a></h3>
 +<p>If you decide to use a SQLite database make sure that you have installed and
 +enabled the SQLite extension in PHP. The PHP configuration in <tt class="file docutils literal"><span class="pre">/etc/php5/conf.d/sqlite3.ini</span></tt> could look like this:</p>
 +<div class="highlight-ini"><div class="highlight"><pre><span class="c"># configuration for PHP SQLite3 module</span>
 +<span class="na">extension</span><span class="o">=</span><span class="s">pdo_sqlite.so</span>
 +<span class="na">extension</span><span class="o">=</span><span class="s">sqlite3.so</span>
 +</pre></div>
 +</div>
 +<p>It is not necessary to create a database and a database user in advance
 +because this will automatically be done by ownCloud when you login for the
 +first time.</p>
 +<p>In the ownCloud configuration in <tt class="file docutils literal"><span class="pre">config/config.php</span></tt> you need to set at least the <strong>datadirectory</strong> parameter to
 +the directory where your data and database should be stored. Note that for the PDO SQLite driver this directory must
 +be writable (this is recommended for ownCloud anyway).  No authentication is required to access the database therefore
 +most of the default parameters could be taken as is:</p>
 +<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
 +
 +  <span class="s2">"dbtype"</span>        <span class="o">=></span> <span class="s2">"sqlite"</span><span class="p">,</span>
 +  <span class="s2">"dbname"</span>        <span class="o">=></span> <span class="s2">"owncloud"</span><span class="p">,</span>
 +  <span class="s2">"dbuser"</span>        <span class="o">=></span> <span class="s2">""</span><span class="p">,</span>
 +  <span class="s2">"dbpassword"</span>    <span class="o">=></span> <span class="s2">""</span><span class="p">,</span>
 +  <span class="s2">"dbhost"</span>        <span class="o">=></span> <span class="s2">""</span><span class="p">,</span>
 +  <span class="s2">"dbtableprefix"</span> <span class="o">=></span> <span class="s2">""</span><span class="p">,</span>
 +  <span class="s2">"datadirectory"</span> <span class="o">=></span> <span class="s2">"/www/htdocs/owncloud/data"</span><span class="p">,</span>
 +</pre></div>
 +</div>
 +</div>
 +<div class="section" id="postgresql-database">
 +<h3>PostgreSQL Database<a class="headerlink" href="#postgresql-database" title="Permalink to this headline">¶</a></h3>
 +<p>If you decide to use a PostgreSQL database make sure that you have installed
 +and enabled the PostgreSQL extension in PHP. The PHP configuration in <tt class="file docutils literal"><span class="pre">/etc/php5/conf.d/pgsql.ini</span></tt> could look
 +like this:</p>
 +<div class="highlight-ini"><div class="highlight"><pre><span class="c"># configuration for PHP PostgreSQL module</span>
 +<span class="na">extension</span><span class="o">=</span><span class="s">pdo_pgsql.so</span>
 +<span class="na">extension</span><span class="o">=</span><span class="s">pgsql.so</span>
 +
 +<span class="k">[PostgresSQL]</span>
 +<span class="na">pgsql.allow_persistent</span> <span class="o">=</span> <span class="s">On</span>
 +<span class="na">pgsql.auto_reset_persistent</span> <span class="o">=</span> <span class="s">Off</span>
 +<span class="na">pgsql.max_persistent</span> <span class="o">=</span> <span class="s">-1</span>
 +<span class="na">pgsql.max_links</span> <span class="o">=</span> <span class="s">-1</span>
 +<span class="na">pgsql.ignore_notice</span> <span class="o">=</span> <span class="s">0</span>
 +<span class="na">pgsql.log_notice</span> <span class="o">=</span> <span class="s">0</span>
 +</pre></div>
 +</div>
 +<p>Now you need to create a database user and the database itself by using the
 +PostgreSQL command line interface. The database tables will be created by
 +ownCloud when you login for the first time.</p>
 +<p>To start the postgres command line mode use:</p>
 +<div class="highlight-python"><div class="highlight"><pre><span class="n">psql</span> <span class="o">-</span><span class="n">hlocalhost</span> <span class="o">-</span><span class="n">Upostgres</span>
 +</pre></div>
 +</div>
 +<p>Then a <strong>postgres=#</strong> prompt will appear. Now enter the following lines and confirm them with the enter key:</p>
 +<div class="highlight-sql"><div class="highlight"><pre><span class="k">CREATE</span> <span class="k">USER</span> <span class="n">username</span> <span class="k">WITH</span> <span class="n">PASSWORD</span> <span class="s1">'password'</span><span class="p">;</span>
 +<span class="k">CREATE</span> <span class="k">DATABASE</span> <span class="n">owncloud</span> <span class="k">TEMPLATE</span> <span class="n">template0</span> <span class="k">ENCODING</span> <span class="s1">'UNICODE'</span><span class="p">;</span>
 +<span class="k">ALTER</span> <span class="k">DATABASE</span> <span class="n">owncloud</span> <span class="k">OWNER</span> <span class="k">TO</span> <span class="n">username</span><span class="p">;</span>
 +<span class="k">GRANT</span> <span class="k">ALL</span> <span class="k">PRIVILEGES</span> <span class="k">ON</span> <span class="k">DATABASE</span> <span class="n">owncloud</span> <span class="k">TO</span> <span class="n">username</span><span class="p">;</span>
 +</pre></div>
 +</div>
 +<p>You can quit the prompt by entering:</p>
 +<div class="highlight-python"><pre>\q</pre>
 +</div>
 +<p>In the ownCloud configuration you need to set the hostname on which the
 +database is running and a valid username (and sometimes a password) to
 +access it. If the database has been installed on the same server as
 +ownCloud a password is very often not required to access the database.</p>
 +<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
 +
 +  <span class="s2">"dbtype"</span>        <span class="o">=></span> <span class="s2">"pgsql"</span><span class="p">,</span>
 +  <span class="s2">"dbname"</span>        <span class="o">=></span> <span class="s2">"owncloud"</span><span class="p">,</span>
 +  <span class="s2">"dbuser"</span>        <span class="o">=></span> <span class="s2">"username"</span><span class="p">,</span>
 +  <span class="s2">"dbpassword"</span>    <span class="o">=></span> <span class="s2">"password"</span><span class="p">,</span>
 +  <span class="s2">"dbhost"</span>        <span class="o">=></span> <span class="s2">"localhost"</span><span class="p">,</span>
 +  <span class="s2">"dbtableprefix"</span> <span class="o">=></span> <span class="s2">""</span><span class="p">,</span>
 +</pre></div>
 +</div>
 +</div>
 +<div class="section" id="oracle-database">
 +<h3>Oracle Database<a class="headerlink" href="#oracle-database" title="Permalink to this headline">¶</a></h3>
 +<p>If you are deploying to an Oracle database make sure that you have installed
 +and enabled the <a class="reference external" href="http://php.net/manual/en/book.oci8.php">Oracle extension</a> in PHP. The PHP configuration in
 +<tt class="file docutils literal"><span class="pre">/etc/php5/conf.d/oci8.ini</span></tt> could look like this:</p>
 +<div class="highlight-ini"><div class="highlight"><pre><span class="c"># configuration for PHP Oracle extension</span>
 +<span class="na">extension</span><span class="o">=</span><span class="s">oci8.so</span>
 +</pre></div>
 +</div>
 +<p>Make sure that the Oracle environment has been set up for the process trying to use the Oracle extension.
 +For a local Oracle XE installation this can be done by exporting the following environment variables
 +(eg. in <tt class="file docutils literal"><span class="pre">/etc/apache2/envvars</span></tt> for Apache)</p>
 +<div class="highlight-bash"><div class="highlight"><pre><span class="nb">export </span><span class="nv">ORACLE_HOME</span><span class="o">=</span>/u01/app/oracle/product/11.2.0/xe
 +<span class="nb">export </span><span class="nv">LD_LIBRARY_PATH</span><span class="o">=</span><span class="nv">$LD_LIBRARY_PATH</span>:<span class="nv">$ORACLE_HOME</span>/lib
 +</pre></div>
 +</div>
 +<p>Installing and configuring Oracle support for PHP is way out of scope for this document.
 +The official Oracle documentation called <a class="reference external" href="http://www.oracle.com/technetwork/topics/php/underground-php-oracle-manual-098250.html">The Underground PHP and Oracle Manual</a>
 +should help you through the process.</p>
 +<p>Creating a database user for ownCloud can be done by using the sqlplus command line interface
 +or the Oracle Application Express web interface.
 +The database tables will be created by ownCloud when you login for the first time.</p>
 +<p>To start the Oracle command line mode with a DBA account use:</p>
 +<div class="highlight-python"><pre>sqlplus system AS SYSDBA</pre>
 +</div>
 +<p>After entering the password a <strong>SQL></strong> prompt will appear. Now enter the following lines and confirm them with the enter key:</p>
 +<div class="highlight-sql"><div class="highlight"><pre><span class="k">CREATE</span> <span class="k">USER</span> <span class="n">owncloud</span> <span class="n">IDENTIFIED</span> <span class="k">BY</span> <span class="n">password</span><span class="p">;</span>
 +<span class="k">ALTER</span> <span class="k">USER</span> <span class="n">owncloud</span> <span class="k">DEFAULT</span> <span class="n">TABLESPACE</span> <span class="n">users</span>
 +                    <span class="k">TEMPORARY</span> <span class="n">TABLESPACE</span> <span class="n">temp</span>
 +                    <span class="n">QUOTA</span> <span class="n">unlimited</span> <span class="k">ON</span> <span class="n">users</span><span class="p">;</span>
 +<span class="k">GRANT</span> <span class="k">create</span> <span class="k">session</span>
 +    <span class="p">,</span> <span class="k">create</span> <span class="k">table</span>
 +    <span class="p">,</span> <span class="k">create</span> <span class="k">procedure</span>
 +    <span class="p">,</span> <span class="k">create</span> <span class="n">sequence</span>
 +    <span class="p">,</span> <span class="k">create</span> <span class="k">trigger</span>
 +    <span class="p">,</span> <span class="k">create</span> <span class="k">view</span>
 +    <span class="p">,</span> <span class="k">create</span> <span class="n">synonym</span>
 +    <span class="p">,</span> <span class="k">alter</span> <span class="k">session</span>
 +   <span class="k">TO</span> <span class="n">owncloud</span><span class="p">;</span>
 +</pre></div>
 +</div>
 +<div class="admonition note">
 +<p class="first admonition-title">Note</p>
 +<p class="last">In Oracle creating a user is the same as creating a database in other RDBMs, so no <tt class="docutils literal"><span class="pre">CREATE</span> <span class="pre">DATABASE</span></tt> statement is necessary.</p>
 +</div>
 +<p>You can quit the prompt by entering:</p>
 +<div class="highlight-python"><div class="highlight"><pre><span class="nb">exit</span>
 +</pre></div>
 +</div>
 +<p>In the ownCloud configuration you need to set the hostname on which the
 +database is running and a valid username and password to
 +access it. If the database has been installed on the same server as
 +ownCloud to config file could look like this:</p>
 +<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
 +
 +  <span class="s2">"dbtype"</span>        <span class="o">=></span> <span class="s2">"oci"</span><span class="p">,</span>
 +  <span class="s2">"dbname"</span>        <span class="o">=></span> <span class="s2">"XE"</span><span class="p">,</span>
 +  <span class="s2">"dbuser"</span>        <span class="o">=></span> <span class="s2">"owncloud"</span><span class="p">,</span>
 +  <span class="s2">"dbpassword"</span>    <span class="o">=></span> <span class="s2">"password"</span><span class="p">,</span>
 +  <span class="s2">"dbhost"</span>        <span class="o">=></span> <span class="s2">"localhost"</span><span class="p">,</span>
 +</pre></div>
 +</div>
 +<div class="admonition note">
 +<p class="first admonition-title">Note</p>
 +<p class="last">This example assumes you are running an Oracle Express Edition on <tt class="docutils literal"><span class="pre">localhost</span></tt>. The <tt class="docutils literal"><span class="pre">dbname</span></tt> is the name</p>
 +</div>
 +<p>of the Oracle instance. For Oracle Express Edition it is always <tt class="docutils literal"><span class="pre">XE</span></tt>.</p>
 +</div>
 +</div>
 +<div class="section" id="trouble-shooting">
 +<h2>Trouble Shooting<a class="headerlink" href="#trouble-shooting" title="Permalink to this headline">¶</a></h2>
 +<div class="section" id="how-can-i-find-out-if-my-mysql-postgresql-server-is-reachable">
 +<h3>How can I find out if my MySQL/PostgreSQL  server is reachable?<a class="headerlink" href="#how-can-i-find-out-if-my-mysql-postgresql-server-is-reachable" title="Permalink to this headline">¶</a></h3>
 +<p>Use the ping command to check the server availability:</p>
 +<div class="highlight-python"><pre>ping db.server.dom</pre>
 +</div>
 +<div class="highlight-python"><pre>PING db.server.dom (ip-address) 56(84) bytes of data.
 +64 bytes from your-server.local.lan (192.168.1.10): icmp_req=1 ttl=64 time=3.64 ms
 +64 bytes from your-server.local.lan (192.168.1.10): icmp_req=2 ttl=64 time=0.055 ms
 +64 bytes from your-server.local.lan (192.168.1.10): icmp_req=3 ttl=64 time=0.062 ms</pre>
 +</div>
 +</div>
 +<div class="section" id="how-can-i-find-out-if-a-created-user-can-access-a-database">
 +<h3>How can I find out if a created user can access a database?<a class="headerlink" href="#how-can-i-find-out-if-a-created-user-can-access-a-database" title="Permalink to this headline">¶</a></h3>
 +<p>The easiest way to test if a database can be accessed is by starting the
 +command line interface:</p>
 +<p><strong>SQLite</strong>:</p>
 +<div class="highlight-python"><div class="highlight"><pre><span class="n">sqlite3</span> <span class="o">/</span><span class="n">www</span><span class="o">/</span><span class="n">htdocs</span><span class="o">/</span><span class="n">owncloud</span><span class="o">/</span><span class="n">data</span><span class="o">/</span><span class="n">owncloud</span><span class="o">.</span><span class="n">db</span>
 +</pre></div>
 +</div>
 +<div class="highlight-python"><pre>sqlite> .version
 +SQLite 3.7.15.1 2012-12-19 20:39:10 6b85b767d0ff7975146156a99ad673f2c1a23318
 +sqlite> .quit</pre>
 +</div>
 +<p><strong>MySQL</strong>:</p>
 +<div class="highlight-python"><div class="highlight"><pre><span class="n">mysql</span> <span class="o">-</span><span class="n">uUSERNAME</span> <span class="o">-</span><span class="n">p</span>
 +</pre></div>
 +</div>
 +<div class="highlight-python"><pre>mysql> SHOW VARIABLES LIKE "version";
 ++---------------+--------+
 +| Variable_name | Value  |
 ++---------------+--------+
 +| version       | 5.1.67 |
 ++---------------+--------+
 +1 row in set (0.00 sec)
 +mysql> quit</pre>
 +</div>
 +<p><strong>PostgreSQL</strong>:</p>
 +<div class="highlight-python"><div class="highlight"><pre><span class="n">psql</span> <span class="o">-</span><span class="n">Uusername</span> <span class="o">-</span><span class="n">downcloud</span>
 +</pre></div>
 +</div>
 +<div class="highlight-python"><pre>postgres=# SELECT version();
 +PostgreSQL 8.4.12 on i686-pc-linux-gnu, compiled by GCC gcc (GCC) 4.1.3 20080704 (prerelease), 32-bit
 +(1 row)
 +postgres=# \q</pre>
 +</div>
 +<p><strong>Oracle</strong>:</p>
 +<div class="highlight-python"><pre>sqlplus username</pre>
 +</div>
 +<div class="highlight-python"><pre>SQL> select * from v$version;
 +
 +BANNER
 +--------------------------------------------------------------------------------
 +Oracle Database 11g Express Edition Release 11.2.0.2.0 - 64bit Production
 +PL/SQL Release 11.2.0.2.0 - Production
 +CORE  11.2.0.2.0      Production
 +TNS for Linux: Version 11.2.0.2.0 - Production
 +NLSRTL Version 11.2.0.2.0 - Production
 +
 +SQL> exit</pre>
 +</div>
 +</div>
 +<div class="section" id="useful-sql-commands">
 +<h3>Useful SQL commands<a class="headerlink" href="#useful-sql-commands" title="Permalink to this headline">¶</a></h3>
 +<p><strong>Show Database Users</strong>:</p>
 +<div class="highlight-python"><pre>SQLite    : No database user is required.
 +MySQL     : SELECT User,Host FROM mysql.user;
 +PostgreSQL: SELECT * FROM pg_user;
 +Oracle    : SELECT * FROM all_users;</pre>
 +</div>
 +<p><strong>Show available Databases</strong>:</p>
 +<div class="highlight-python"><pre>SQLite    : .databases (normally one database per file!)
 +MySQL     : SHOW DATABASES;
 +PostgreSQL: \l
 +Oracle    : SELECT name FROM v$database; (requires DBA privileges)</pre>
 +</div>
 +<p><strong>Show ownCloud Tables in Database</strong>:</p>
 +<div class="highlight-python"><pre>SQLite    : .tables
 +MySQL     : USE owncloud; SHOW TABLES;
 +PostgreSQL: \c owncloud; \d
 +Oracle    : SELECT table_name FROM user_tables;</pre>
 +</div>
 +<p><strong>Quit Database</strong>:</p>
 +<div class="highlight-python"><pre>SQLite    : .quit
 +MySQL     : quit
 +PostgreSQL: \q
 +Oracle    : quit</pre>
 +</div>
 +</div>
 +</div>
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/configuration/configuration_encryption.html
index 6e7e346,0000000..865a7b2
mode 100644,000000..100644
--- a/core/doc/admin/configuration/configuration_encryption.html
+++ b/core/doc/admin/configuration/configuration_encryption.html
@@@ -1,225 -1,0 +1,228 @@@
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>Using Server-Side Encryption — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '../',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="../_static/jquery.js"></script>
 +    <script type="text/javascript" src="../_static/underscore.js"></script>
 +    <script type="text/javascript" src="../_static/doctools.js"></script>
 +    <script type="text/javascript" src="../_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
 +    <link rel="up" title="Configuration" href="index.html" />
 +    <link rel="next" title="Disable Knowledge Base" href="configuration_knowledgebase.html" />
 +    <link rel="prev" title="MySQL/Postgres/SQLite Support" href="configuration_database.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="../contents.html">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
 +<ul class="current">
 +<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
 +<li class="toctree-l1 current"><a class="reference internal" href="index.html">Configuration</a><ul class="current">
 +<li class="toctree-l2"><a class="reference internal" href="configuration_apps.html">Managing Apps</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_users.html">User Management</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="auth_ldap.html">LDAP Authentication</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="background_jobs.html">Background Jobs</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_3rdparty.html">Find Third-Party Libraries</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_automation.html">Automatic Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_custom_clients.html">Customizing Client Download Links</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_database.html">MySQL/Postgres/SQLite Support</a></li>
 +<li class="toctree-l2 current"><a class="current reference internal" href="">Using Server-Side Encryption</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="#enable-file-recovery-feature">Enable File Recovery Feature</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="#recover-user-files">Recover User Files</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="#ldap-and-other-external-user-back-ends">LDAP and other external user back-ends</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_knowledgebase.html">Disable Knowledge Base</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_language.html">Setting the Default Language</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_logging.html">Configure Logging</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_mail.html">Sending Mail Notifications</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_maintenance.html">Enable Maintenance Mode</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_preview.html">Enabling File Previews</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_reverseproxy.html">Reverse Proxy Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html">Dealing with Big File Uploads</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="custom_mount_config_gui.html">Custom Mount Configuration Web-GUI</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="custom_mount_config.html">Custom Mount Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="custom_user_backend.html">Custom User Backend Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="xsendfile.html">Serving static files via web server</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l1"><a class="reference internal" href="../apps/index.html">Apps</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../sharing_api/index.html">Sharing API</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../config/index.html">The Configuration File</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <div class="section" id="using-server-side-encryption">
 +<h1>Using Server-Side Encryption<a class="headerlink" href="#using-server-side-encryption" title="Permalink to this headline">¶</a></h1>
 +<p>ownCloud ships a encryption app, which allows to encrypt all files stored in
 +your ownCloud. Encryption and decryption always happens server-side. This
 +enables the user to continue to use all the other apps to view and edit his
 +data.</p>
 +<p>The app uses the user’s log-in password as encryption-password. This means that
 +by default the user will lose access to his files if he loses his log-in
 +password.</p>
 +<p>It might be a good idea to make regular backups of all encryption keys. The
 +encryption keys are stored in following folders:</p>
 +<ul class="simple">
 +<li>data/owncloud_private_key (recovery key, if enabled and public share key)</li>
 +<li>data/public-keys (public keys from all users)</li>
 +<li>data/<user>/files_encryption (users’ private keys and all other keys necessary to
 +decrypt the users’ files)</li>
 +</ul>
 +<div class="section" id="enable-file-recovery-feature">
 +<h2>Enable File Recovery Feature<a class="headerlink" href="#enable-file-recovery-feature" title="Permalink to this headline">¶</a></h2>
 +<p>The admin can offer the user some kind of protection against password
 +loss. Therefore you have to enable the recovery key in the admin settings and
 +provide a strong recovery key password. The admin settings also enables you to
 +change the recovery key password if you wish. But you should make sure to never
 +lose this password, because that’s the only way to recover users’ files.</p>
 +<p>Once the recovery key was enabled every user can choose in his personal
 +settings to enable this feature or not.</p>
 +</div>
 +<div class="section" id="recover-user-files">
 +<h2>Recover User Files<a class="headerlink" href="#recover-user-files" title="Permalink to this headline">¶</a></h2>
 +<p>If the recovery feature was enabled the admin will see a additional input field
 +at the top of the user management settings. After entering the recovery-key
 +password the admin can change the user’s log-in password which will
 +automatically recover the user’s file.</p>
 +<p>If you use a user back-end which doesn’t allow you to change the log-in
 +password directly within ownCloud, e.g. the LDAP back-end, than you can follow
 +the same procedure to recover a user’s files. The only difference is that
 +you need to change the log-in password additionally at your back-end. In this
 +case make sure to use both times the same password.</p>
 +</div>
 +<div class="section" id="ldap-and-other-external-user-back-ends">
 +<h2>LDAP and other external user back-ends<a class="headerlink" href="#ldap-and-other-external-user-back-ends" title="Permalink to this headline">¶</a></h2>
 +<p>if you configure a external user back-end you will be able to change the user’s log-in password
 +at the back-end. Since the encryption password must be the same as the user’s log-in password
 +this will result in a non-functional encryption system. If the recovery feature was enabled,
 +the administrator will be able to recover the user’s files directly over the recovery feature.
 +See the description above. Otherwise the user will be informed that his log-in password and
 +his encryption password no longer matches after his next log-in. In this case the user will be
 +able to adjust his encryption password in the personal settings by providing both, his old and
 +his new log-in password.</p>
 +</div>
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/configuration/configuration_knowledgebase.html
index 3966a40,0000000..225f351
mode 100644,000000..100644
--- a/core/doc/admin/configuration/configuration_knowledgebase.html
+++ b/core/doc/admin/configuration/configuration_knowledgebase.html
@@@ -1,195 -1,0 +1,198 @@@
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>Disable Knowledge Base — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '../',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="../_static/jquery.js"></script>
 +    <script type="text/javascript" src="../_static/underscore.js"></script>
 +    <script type="text/javascript" src="../_static/doctools.js"></script>
 +    <script type="text/javascript" src="../_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
 +    <link rel="up" title="Configuration" href="index.html" />
 +    <link rel="next" title="Setting the Default Language" href="configuration_language.html" />
 +    <link rel="prev" title="Using Server-Side Encryption" href="configuration_encryption.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="../contents.html">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
 +<ul class="current">
 +<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
 +<li class="toctree-l1 current"><a class="reference internal" href="index.html">Configuration</a><ul class="current">
 +<li class="toctree-l2"><a class="reference internal" href="configuration_apps.html">Managing Apps</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_users.html">User Management</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="auth_ldap.html">LDAP Authentication</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="background_jobs.html">Background Jobs</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_3rdparty.html">Find Third-Party Libraries</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_automation.html">Automatic Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_custom_clients.html">Customizing Client Download Links</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_database.html">MySQL/Postgres/SQLite Support</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_encryption.html">Using Server-Side Encryption</a></li>
 +<li class="toctree-l2 current"><a class="current reference internal" href="">Disable Knowledge Base</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="#parameters">Parameters</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_language.html">Setting the Default Language</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_logging.html">Configure Logging</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_mail.html">Sending Mail Notifications</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_maintenance.html">Enable Maintenance Mode</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_preview.html">Enabling File Previews</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_reverseproxy.html">Reverse Proxy Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html">Dealing with Big File Uploads</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="custom_mount_config_gui.html">Custom Mount Configuration Web-GUI</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="custom_mount_config.html">Custom Mount Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="custom_user_backend.html">Custom User Backend Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="xsendfile.html">Serving static files via web server</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l1"><a class="reference internal" href="../apps/index.html">Apps</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../sharing_api/index.html">Sharing API</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../config/index.html">The Configuration File</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <div class="section" id="disable-knowledge-base">
 +<h1>Disable Knowledge Base<a class="headerlink" href="#disable-knowledge-base" title="Permalink to this headline">¶</a></h1>
 +<p>The usage of ownCloud is more or less self explaining but nevertheless a user
 +might run into a problem where he needs to consult the documentation or
 +knowledge base. To ease access to the ownCloud documentation and knowledge
 +base, a help menu item is shown in the settings menu by default.</p>
 +<div class="section" id="parameters">
 +<h2>Parameters<a class="headerlink" href="#parameters" title="Permalink to this headline">¶</a></h2>
 +<p>If you want to disable the ownCloud help menu item you can use the <strong>knowledgebaseenabled</strong> parameter inside the
 +<tt class="file docutils literal"><span class="pre">config/config.php</span></tt>. The <strong>knowledgebaseurl</strong> parameter is used to set the http path to the ownCloud help page.
 +The server should support <abbr title="Open Collaboration Services">OCS</abbr>.</p>
 +<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
 +
 +  <span class="s2">"knowledgebaseenabled"</span> <span class="o">=></span> <span class="k">true</span><span class="p">,</span>
 +  <span class="s2">"knowledgebaseurl"</span>     <span class="o">=></span> <span class="s2">"http://api.apps.owncloud.com/v1"</span><span class="p">,</span>
 +</pre></div>
 +</div>
 +<div class="admonition note">
 +<p class="first admonition-title">Note</p>
 +<p class="last">Disabling the help menu item might increase the number of support request you have to answer in the future</p>
 +</div>
 +</div>
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/configuration/configuration_language.html
index a098c4c,0000000..fc6e645
mode 100644,000000..100644
--- a/core/doc/admin/configuration/configuration_language.html
+++ b/core/doc/admin/configuration/configuration_language.html
@@@ -1,191 -1,0 +1,194 @@@
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>Setting the Default Language — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '../',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="../_static/jquery.js"></script>
 +    <script type="text/javascript" src="../_static/underscore.js"></script>
 +    <script type="text/javascript" src="../_static/doctools.js"></script>
 +    <script type="text/javascript" src="../_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
 +    <link rel="up" title="Configuration" href="index.html" />
 +    <link rel="next" title="Configure Logging" href="configuration_logging.html" />
 +    <link rel="prev" title="Disable Knowledge Base" href="configuration_knowledgebase.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="../contents.html">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
 +<ul class="current">
 +<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
 +<li class="toctree-l1 current"><a class="reference internal" href="index.html">Configuration</a><ul class="current">
 +<li class="toctree-l2"><a class="reference internal" href="configuration_apps.html">Managing Apps</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_users.html">User Management</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="auth_ldap.html">LDAP Authentication</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="background_jobs.html">Background Jobs</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_3rdparty.html">Find Third-Party Libraries</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_automation.html">Automatic Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_custom_clients.html">Customizing Client Download Links</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_database.html">MySQL/Postgres/SQLite Support</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_encryption.html">Using Server-Side Encryption</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_knowledgebase.html">Disable Knowledge Base</a></li>
 +<li class="toctree-l2 current"><a class="current reference internal" href="">Setting the Default Language</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="#parameters">Parameters</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_logging.html">Configure Logging</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_mail.html">Sending Mail Notifications</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_maintenance.html">Enable Maintenance Mode</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_preview.html">Enabling File Previews</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_reverseproxy.html">Reverse Proxy Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html">Dealing with Big File Uploads</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="custom_mount_config_gui.html">Custom Mount Configuration Web-GUI</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="custom_mount_config.html">Custom Mount Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="custom_user_backend.html">Custom User Backend Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="xsendfile.html">Serving static files via web server</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l1"><a class="reference internal" href="../apps/index.html">Apps</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../sharing_api/index.html">Sharing API</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../config/index.html">The Configuration File</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <div class="section" id="setting-the-default-language">
 +<h1>Setting the Default Language<a class="headerlink" href="#setting-the-default-language" title="Permalink to this headline">¶</a></h1>
 +<p>In normal cases ownCloud will automatically detect the language of the Web-GUI.
 +If this doesn’t work properly or you want to make sure that ownCloud always
 +starts with a given language, you can use the <strong>default_language</strong> parameter.</p>
 +<p>Please keep in mind, that this will not effect a users language preference,
 +which has been configured under “personal -> language” once he has logged in.</p>
 +<p>Please check <tt class="file docutils literal"><span class="pre">settings/languageCodes.php</span></tt> for the list of supported language
 +codes.</p>
 +<div class="section" id="parameters">
 +<h2>Parameters<a class="headerlink" href="#parameters" title="Permalink to this headline">¶</a></h2>
 +<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
 +
 +  <span class="s2">"default_language"</span> <span class="o">=></span> <span class="s2">"en"</span><span class="p">,</span>
 +</pre></div>
 +</div>
 +<p>This parameters can be set in the <tt class="file docutils literal"><span class="pre">config/config.php</span></tt></p>
 +</div>
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/configuration/configuration_logging.html
index 0a1e134,0000000..c26ece3
mode 100644,000000..100644
--- a/core/doc/admin/configuration/configuration_logging.html
+++ b/core/doc/admin/configuration/configuration_logging.html
@@@ -1,227 -1,0 +1,230 @@@
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>Configure Logging — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '../',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="../_static/jquery.js"></script>
 +    <script type="text/javascript" src="../_static/underscore.js"></script>
 +    <script type="text/javascript" src="../_static/doctools.js"></script>
 +    <script type="text/javascript" src="../_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
 +    <link rel="up" title="Configuration" href="index.html" />
 +    <link rel="next" title="Sending Mail Notifications" href="configuration_mail.html" />
 +    <link rel="prev" title="Setting the Default Language" href="configuration_language.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="../contents.html">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
 +<ul class="current">
 +<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
 +<li class="toctree-l1 current"><a class="reference internal" href="index.html">Configuration</a><ul class="current">
 +<li class="toctree-l2"><a class="reference internal" href="configuration_apps.html">Managing Apps</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_users.html">User Management</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="auth_ldap.html">LDAP Authentication</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="background_jobs.html">Background Jobs</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_3rdparty.html">Find Third-Party Libraries</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_automation.html">Automatic Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_custom_clients.html">Customizing Client Download Links</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_database.html">MySQL/Postgres/SQLite Support</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_encryption.html">Using Server-Side Encryption</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_knowledgebase.html">Disable Knowledge Base</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_language.html">Setting the Default Language</a></li>
 +<li class="toctree-l2 current"><a class="current reference internal" href="">Configure Logging</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="#parameters">Parameters</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_mail.html">Sending Mail Notifications</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_maintenance.html">Enable Maintenance Mode</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_preview.html">Enabling File Previews</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_reverseproxy.html">Reverse Proxy Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html">Dealing with Big File Uploads</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="custom_mount_config_gui.html">Custom Mount Configuration Web-GUI</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="custom_mount_config.html">Custom Mount Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="custom_user_backend.html">Custom User Backend Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="xsendfile.html">Serving static files via web server</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l1"><a class="reference internal" href="../apps/index.html">Apps</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../sharing_api/index.html">Sharing API</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../config/index.html">The Configuration File</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <div class="section" id="configure-logging">
 +<h1>Configure Logging<a class="headerlink" href="#configure-logging" title="Permalink to this headline">¶</a></h1>
 +<p>To get an idea of how the current status of an ownCloud system is or to
 +solve issues log information is a good point to start with. ownCloud allows
 +to configure the way how and which depth of information should be logged.</p>
 +<div class="section" id="parameters">
 +<h2>Parameters<a class="headerlink" href="#parameters" title="Permalink to this headline">¶</a></h2>
 +<p>First you need to decide in which way logging should be done. You can
 +choose between the two options <strong>owncloud</strong> and <strong>syslog</strong>. Then you need
 +to configure the log level which directly influences how much information
 +will be logged. You can choose between:</p>
 +<ul class="simple">
 +<li><strong>0</strong>: DEBUG</li>
 +<li><strong>1</strong>: INFO</li>
 +<li><strong>2</strong>: WARN</li>
 +<li><strong>3</strong>: ERROR</li>
 +</ul>
 +<p>The most detailed information will be written if <strong>0</strong> (DEBUG) is set, the
 +least information will be written if <strong>3</strong> (ERROR) is set. Keep in mind that
 +it might slow down the whole system if a too detailed logging will has been
 +configured. By default the log level is set to <strong>2</strong> (WARN).</p>
 +<p>This parameters can be set in the <tt class="file docutils literal"><span class="pre">config/config.php</span></tt></p>
 +<div class="section" id="owncloud">
 +<h3>ownCloud<a class="headerlink" href="#owncloud" title="Permalink to this headline">¶</a></h3>
 +<p>All log information will be written to a separate log file which can be
 +viewed using the log menu in the admin menu of ownCloud. By default a log
 +file named <strong>owncloud.log</strong> will be created in the directory which has
 +been configured by the <strong>datadirectory</strong> parameter.</p>
 +<p>The desired date format can optionally be defined using the <strong>logdateformat</strong>.
 +By default the <a class="reference external" href="http://www.php.net/manual/en/function.date.php">PHP date function</a> parameter “<em>c</em>” is used and therefore the
 +date/time is written in the format “<em>2013-01-10T15:20:25+02:00</em>”. By using the
 +date format in the example the date/time format will be written in the format
 +“<em>January 10, 2013 15:20:25</em>”.</p>
 +<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
 +
 +  <span class="s2">"log_type"</span> <span class="o">=></span> <span class="s2">"owncloud"</span><span class="p">,</span>
 +  <span class="s2">"logfile"</span> <span class="o">=></span> <span class="s2">"owncloud.log"</span><span class="p">,</span>
 +  <span class="s2">"loglevel"</span> <span class="o">=></span> <span class="s2">"3"</span><span class="p">,</span>
 +  <span class="s2">"logdateformat"</span> <span class="o">=></span> <span class="s2">"F d, Y H:i:s"</span><span class="p">,</span>
 +</pre></div>
 +</div>
 +</div>
 +<div class="section" id="syslog">
 +<h3>syslog<a class="headerlink" href="#syslog" title="Permalink to this headline">¶</a></h3>
 +<p>All log information will be send to the default syslog daemon of a system.</p>
 +<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
 +
 +  <span class="s2">"log_type"</span> <span class="o">=></span> <span class="s2">"syslog"</span><span class="p">,</span>
 +  <span class="s2">"logfile"</span> <span class="o">=></span> <span class="s2">""</span><span class="p">,</span>
 +  <span class="s2">"loglevel"</span> <span class="o">=></span> <span class="s2">"3"</span><span class="p">,</span>
 +</pre></div>
 +</div>
 +</div>
 +</div>
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/configuration/configuration_mail.html
index e483127,0000000..dae5139
mode 100644,000000..100644
--- a/core/doc/admin/configuration/configuration_mail.html
+++ b/core/doc/admin/configuration/configuration_mail.html
@@@ -1,457 -1,0 +1,460 @@@
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>Sending Mail Notifications — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '../',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="../_static/jquery.js"></script>
 +    <script type="text/javascript" src="../_static/underscore.js"></script>
 +    <script type="text/javascript" src="../_static/doctools.js"></script>
 +    <script type="text/javascript" src="../_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
 +    <link rel="up" title="Configuration" href="index.html" />
 +    <link rel="next" title="Enable Maintenance Mode" href="configuration_maintenance.html" />
 +    <link rel="prev" title="Configure Logging" href="configuration_logging.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="../contents.html">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
 +<ul class="current">
 +<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
 +<li class="toctree-l1 current"><a class="reference internal" href="index.html">Configuration</a><ul class="current">
 +<li class="toctree-l2"><a class="reference internal" href="configuration_apps.html">Managing Apps</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_users.html">User Management</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="auth_ldap.html">LDAP Authentication</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="background_jobs.html">Background Jobs</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_3rdparty.html">Find Third-Party Libraries</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_automation.html">Automatic Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_custom_clients.html">Customizing Client Download Links</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_database.html">MySQL/Postgres/SQLite Support</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_encryption.html">Using Server-Side Encryption</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_knowledgebase.html">Disable Knowledge Base</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_language.html">Setting the Default Language</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_logging.html">Configure Logging</a></li>
 +<li class="toctree-l2 current"><a class="current reference internal" href="">Sending Mail Notifications</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="#requirements">Requirements</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="#parameters">Parameters</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="#send-a-test-email">Send a Test Email</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="#trouble-shooting">Trouble shooting</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_maintenance.html">Enable Maintenance Mode</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_preview.html">Enabling File Previews</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_reverseproxy.html">Reverse Proxy Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html">Dealing with Big File Uploads</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="custom_mount_config_gui.html">Custom Mount Configuration Web-GUI</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="custom_mount_config.html">Custom Mount Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="custom_user_backend.html">Custom User Backend Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="xsendfile.html">Serving static files via web server</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l1"><a class="reference internal" href="../apps/index.html">Apps</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../sharing_api/index.html">Sharing API</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../config/index.html">The Configuration File</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <div class="section" id="sending-mail-notifications">
 +<h1>Sending Mail Notifications<a class="headerlink" href="#sending-mail-notifications" title="Permalink to this headline">¶</a></h1>
 +<p>ownCloud does not contain a full email program but contains some parameters to
 +allow to send e.g. password reset email to the users. This function relies on
 +the <a class="reference external" href="http://sourceforge.net/projects/phpmailer/">PHPMailer library</a>. To
 +take advantage of this function it needs to be configured properly.</p>
 +<div class="section" id="requirements">
 +<h2>Requirements<a class="headerlink" href="#requirements" title="Permalink to this headline">¶</a></h2>
 +<p>Different requirements need to be matched, depending on the environment which
 +you are using and the way how you want to send email. You can choose between
 +<strong>SMTP</strong>, <strong>PHP mail</strong>, <strong>Sendmail</strong> and <strong>qmail</strong>.</p>
 +</div>
 +<div class="section" id="parameters">
 +<h2>Parameters<a class="headerlink" href="#parameters" title="Permalink to this headline">¶</a></h2>
 +<p>All parameters need to be set in <tt class="file docutils literal"><span class="pre">config/config.php</span></tt></p>
 +<div class="section" id="smtp">
 +<h3>SMTP<a class="headerlink" href="#smtp" title="Permalink to this headline">¶</a></h3>
 +<p>If you want to send email using a local or remote SMTP server it is necessary
 +to enter the name or ip address of the server, optionally followed by a colon
 +separated port number, e.g. <strong>:425</strong>. If this value is not given the default
 +port 25/tcp will be used unless you will change that by modifying the
 +<strong>mail_smtpport</strong> parameter. Multiple server can be entered separated by
 +semicolon:</p>
 +<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
 +
 +  <span class="s2">"mail_smtpmode"</span>     <span class="o">=></span> <span class="s2">"smtp"</span><span class="p">,</span>
 +  <span class="s2">"mail_smtphost"</span>     <span class="o">=></span> <span class="s2">"smtp-1.server.dom;smtp-2.server.dom:425"</span><span class="p">,</span>
 +  <span class="s2">"mail_smtpport"</span>     <span class="o">=></span> <span class="mi">25</span><span class="p">,</span>
 +</pre></div>
 +</div>
 +<p>or</p>
 +<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
 +
 +  <span class="s2">"mail_smtpmode"</span>     <span class="o">=></span> <span class="s2">"smtp"</span><span class="p">,</span>
 +  <span class="s2">"mail_smtphost"</span>     <span class="o">=></span> <span class="s2">"smtp.server.dom"</span><span class="p">,</span>
 +  <span class="s2">"mail_smtpport"</span>     <span class="o">=></span> <span class="mi">425</span><span class="p">,</span>
 +</pre></div>
 +</div>
 +<p>If a malware or SPAM scanner is running on the SMTP server it might be
 +necessary that you increase the SMTP timeout to e.g. 30s:</p>
 +<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
 +
 +  <span class="s2">"mail_smtptimeout"</span>  <span class="o">=></span> <span class="mi">30</span><span class="p">,</span>
 +</pre></div>
 +</div>
 +<p>If the SMTP server accepts insecure connections, the default setting can be
 +used:</p>
 +<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
 +
 +<span class="s2">"mail_smtpsecure"</span>   <span class="o">=></span> <span class="s1">''</span><span class="p">,</span>
 +</pre></div>
 +</div>
 +<p>If the SMTP server only accepts secure connections you can choose between
 +the following two variants:</p>
 +<div class="section" id="ssl">
 +<h4>SSL<a class="headerlink" href="#ssl" title="Permalink to this headline">¶</a></h4>
 +<p>A secure connection will be initiated using the outdated SMTPS protocol
 +which uses the port 465/tcp:</p>
 +<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
 +
 +  <span class="s2">"mail_smtphost"</span>     <span class="o">=></span> <span class="s2">"smtp.server.dom:465"</span><span class="p">,</span>
 +  <span class="s2">"mail_smtpsecure"</span>   <span class="o">=></span> <span class="s1">'ssl'</span><span class="p">,</span>
 +</pre></div>
 +</div>
 +</div>
 +<div class="section" id="tls">
 +<h4>TLS<a class="headerlink" href="#tls" title="Permalink to this headline">¶</a></h4>
 +<p>A secure connection will be initiated using the STARTTLS protocol which
 +uses the default port 25/tcp:</p>
 +<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
 +
 +  <span class="s2">"mail_smtphost"</span>     <span class="o">=></span> <span class="s2">"smtp.server.dom"</span><span class="p">,</span>
 +  <span class="s2">"mail_smtpsecure"</span>   <span class="o">=></span> <span class="s1">'tls'</span><span class="p">,</span>
 +</pre></div>
 +</div>
 +<p>And finally it is necessary to configure if the SMTP server requires
 +authentication, if not, the default values can be taken as it.</p>
 +<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
 +
 +  <span class="s2">"mail_smtpauth"</span>     <span class="o">=></span> <span class="k">false</span><span class="p">,</span>
 +  <span class="s2">"mail_smtpname"</span>     <span class="o">=></span> <span class="s2">""</span><span class="p">,</span>
 +  <span class="s2">"mail_smtppassword"</span> <span class="o">=></span> <span class="s2">""</span><span class="p">,</span>
 +</pre></div>
 +</div>
 +<p>If SMTP authentication is required you have to set the required username
 +and password and can optionally choose between the authentication types
 +<strong>LOGIN</strong> (default) or <strong>PLAIN</strong>.</p>
 +<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
 +
 +  <span class="s2">"mail_smtpauth"</span>     <span class="o">=></span> <span class="k">true</span><span class="p">,</span>
 +  <span class="s2">"mail_smtpauthtype"</span> <span class="o">=></span> <span class="s2">"LOGIN"</span><span class="p">,</span>
 +  <span class="s2">"mail_smtpname"</span>     <span class="o">=></span> <span class="s2">"username"</span><span class="p">,</span>
 +  <span class="s2">"mail_smtppassword"</span> <span class="o">=></span> <span class="s2">"password"</span><span class="p">,</span>
 +</pre></div>
 +</div>
 +</div>
 +</div>
 +<div class="section" id="php-mail">
 +<h3>PHP mail<a class="headerlink" href="#php-mail" title="Permalink to this headline">¶</a></h3>
 +<p>If you want to use PHP mail it is necessary to have an installed and working
 +email system on your server. Which program in detail is used to send email is
 +defined by the configuration settings in the <strong>php.ini</strong> file. (On *nix
 +systems this will most likely be Sendmail.) ownCloud should be able to send
 +email out of the box.</p>
 +<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
 +
 +  <span class="s2">"mail_smtpmode"</span>     <span class="o">=></span> <span class="s2">"php"</span><span class="p">,</span>
 +  <span class="s2">"mail_smtphost"</span>     <span class="o">=></span> <span class="s2">"127.0.0.1"</span><span class="p">,</span>
 +  <span class="s2">"mail_smtpport"</span>     <span class="o">=></span> <span class="mi">25</span><span class="p">,</span>
 +  <span class="s2">"mail_smtptimeout"</span>  <span class="o">=></span> <span class="mi">10</span><span class="p">,</span>
 +  <span class="s2">"mail_smtpsecure"</span>   <span class="o">=></span> <span class="s2">""</span><span class="p">,</span>
 +  <span class="s2">"mail_smtpauth"</span>     <span class="o">=></span> <span class="k">false</span><span class="p">,</span>
 +  <span class="s2">"mail_smtpauthtype"</span> <span class="o">=></span> <span class="s2">"LOGIN"</span><span class="p">,</span>
 +  <span class="s2">"mail_smtpname"</span>     <span class="o">=></span> <span class="s2">""</span><span class="p">,</span>
 +  <span class="s2">"mail_smtppassword"</span> <span class="o">=></span> <span class="s2">""</span><span class="p">,</span>
 +</pre></div>
 +</div>
 +</div>
 +<div class="section" id="sendmail">
 +<h3>Sendmail<a class="headerlink" href="#sendmail" title="Permalink to this headline">¶</a></h3>
 +<p>If you want to use the well known Sendmail program to send email, it is
 +necessary to have an installed and working email system on your *nix server.
 +The sendmail binary (<strong>/usr/sbin/sendmail</strong>) is usually part of that system.
 +ownCloud should be able to send email out of the box.</p>
 +<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
 +
 +  <span class="s2">"mail_smtpmode"</span>     <span class="o">=></span> <span class="s2">"sendmail"</span><span class="p">,</span>
 +  <span class="s2">"mail_smtphost"</span>     <span class="o">=></span> <span class="s2">"127.0.0.1"</span><span class="p">,</span>
 +  <span class="s2">"mail_smtpport"</span>     <span class="o">=></span> <span class="mi">25</span><span class="p">,</span>
 +  <span class="s2">"mail_smtptimeout"</span>  <span class="o">=></span> <span class="mi">10</span><span class="p">,</span>
 +  <span class="s2">"mail_smtpsecure"</span>   <span class="o">=></span> <span class="s2">""</span><span class="p">,</span>
 +  <span class="s2">"mail_smtpauth"</span>     <span class="o">=></span> <span class="k">false</span><span class="p">,</span>
 +  <span class="s2">"mail_smtpauthtype"</span> <span class="o">=></span> <span class="s2">"LOGIN"</span><span class="p">,</span>
 +  <span class="s2">"mail_smtpname"</span>     <span class="o">=></span> <span class="s2">""</span><span class="p">,</span>
 +  <span class="s2">"mail_smtppassword"</span> <span class="o">=></span> <span class="s2">""</span><span class="p">,</span>
 +</pre></div>
 +</div>
 +</div>
 +<div class="section" id="qmail">
 +<h3>qmail<a class="headerlink" href="#qmail" title="Permalink to this headline">¶</a></h3>
 +<p>If you want to use the qmail program to send email, it is necessary to have an
 +installed and working qmail email system on your server. The sendmail binary
 +(<strong>/var/qmail/bin/sendmail</strong>) will then be used to send email. ownCloud should
 +be able to send email out of the box.</p>
 +<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
 +
 +  <span class="s2">"mail_smtpmode"</span>     <span class="o">=></span> <span class="s2">"qmail"</span><span class="p">,</span>
 +  <span class="s2">"mail_smtphost"</span>     <span class="o">=></span> <span class="s2">"127.0.0.1"</span><span class="p">,</span>
 +  <span class="s2">"mail_smtpport"</span>     <span class="o">=></span> <span class="mi">25</span><span class="p">,</span>
 +  <span class="s2">"mail_smtptimeout"</span>  <span class="o">=></span> <span class="mi">10</span><span class="p">,</span>
 +  <span class="s2">"mail_smtpsecure"</span>   <span class="o">=></span> <span class="s2">""</span><span class="p">,</span>
 +  <span class="s2">"mail_smtpauth"</span>     <span class="o">=></span> <span class="k">false</span><span class="p">,</span>
 +  <span class="s2">"mail_smtpauthtype"</span> <span class="o">=></span> <span class="s2">"LOGIN"</span><span class="p">,</span>
 +  <span class="s2">"mail_smtpname"</span>     <span class="o">=></span> <span class="s2">""</span><span class="p">,</span>
 +  <span class="s2">"mail_smtppassword"</span> <span class="o">=></span> <span class="s2">""</span><span class="p">,</span>
 +</pre></div>
 +</div>
 +</div>
 +</div>
 +<div class="section" id="send-a-test-email">
 +<h2>Send a Test Email<a class="headerlink" href="#send-a-test-email" title="Permalink to this headline">¶</a></h2>
 +<p>The only way to test your email configuration is, to force a login failure,
 +because a function to send a test email has not be implemented yet.</p>
 +<p>First make sure that you are using a full qualified domain and not an ip address in the ownCloud URL, like:</p>
 +<div class="highlight-python"><pre>http://my-owncloud-server.domain.dom/owncloud/</pre>
 +</div>
 +<p>The password reset function fetches the domain name from that URL to build the
 +email sender address, e.g.:</p>
 +<div class="highlight-python"><pre>john at domain.dom</pre>
 +</div>
 +<p>Next you need to enter your login and an <em>invalid</em> password. As soon as you
 +press the login button the login mask reappears and a <strong>I’ve forgotten my password</strong> link will be shown above the login
 +field. Click on that link, re-enter your login and press the <strong>Reset password</strong> button - that’s all.</p>
 +</div>
 +<div class="section" id="trouble-shooting">
 +<h2>Trouble shooting<a class="headerlink" href="#trouble-shooting" title="Permalink to this headline">¶</a></h2>
 +<div class="section" id="my-web-domain-is-different-from-my-mail-domain">
 +<h3>My web domain is different from my mail domain?<a class="headerlink" href="#my-web-domain-is-different-from-my-mail-domain" title="Permalink to this headline">¶</a></h3>
 +<p>The default domain name used for the sender address is the hostname where your ownCloud installation is served.
 +If you have a different mail domain name you can override this behavior by setting the following configuration parameter:</p>
 +<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
 +
 +  <span class="s2">"mail_domain"</span> <span class="o">=></span> <span class="s2">"example.com"</span><span class="p">,</span>
 +</pre></div>
 +</div>
 +<p>Now every mail send by ownCloud e.g. password reset email, will have the domain part of the sender address look like:</p>
 +<div class="highlight-python"><pre>no-reply at example.com</pre>
 +</div>
 +</div>
 +<div class="section" id="how-can-i-find-out-if-a-smtp-server-is-reachable">
 +<h3>How can I find out if a SMTP server is reachable?<a class="headerlink" href="#how-can-i-find-out-if-a-smtp-server-is-reachable" title="Permalink to this headline">¶</a></h3>
 +<p>Use the ping command to check the server availability:</p>
 +<div class="highlight-python"><pre>ping smtp.server.dom</pre>
 +</div>
 +<div class="highlight-python"><pre>PING smtp.server.dom (ip-address) 56(84) bytes of data.
 +64 bytes from your-server.local.lan (192.168.1.10): icmp_req=1 ttl=64 time=3.64 ms
 +64 bytes from your-server.local.lan (192.168.1.10): icmp_req=2 ttl=64 time=0.055 ms
 +64 bytes from your-server.local.lan (192.168.1.10): icmp_req=3 ttl=64 time=0.062 ms</pre>
 +</div>
 +</div>
 +<div class="section" id="how-can-i-find-out-if-the-smtp-server-is-listening-on-a-specific-tcp-port">
 +<h3>How can I find out if the SMTP server is listening on a specific tcp port?<a class="headerlink" href="#how-can-i-find-out-if-the-smtp-server-is-listening-on-a-specific-tcp-port" title="Permalink to this headline">¶</a></h3>
 +<p>A SMTP server is usually listening on port <strong>25/tcp</strong> (smtp) and/or in
 +rare circumstances is also listening on the outdated port <strong>465/tcp</strong> (smtps).
 +You can use the telnet command to check if a port is available:</p>
 +<div class="highlight-python"><pre>telnet smtp.domain.dom 25</pre>
 +</div>
 +<div class="highlight-python"><pre>Trying 192.168.1.10...
 +Connected to smtp.domain.dom.
 +Escape character is '^]'.
 +220 smtp.domain.dom ESMTP Exim 4.80.1 Tue, 22 Jan 2013 22:28:14 +0100</pre>
 +</div>
 +</div>
 +<div class="section" id="how-can-i-find-out-if-a-smtp-server-supports-the-outdated-smtps-protocol">
 +<h3>How can I find out if a SMTP server supports the outdated SMTPS protocol?<a class="headerlink" href="#how-can-i-find-out-if-a-smtp-server-supports-the-outdated-smtps-protocol" title="Permalink to this headline">¶</a></h3>
 +<p>A good indication that a SMTP server supports the SMTPS protocol is that it
 +is listening on port <strong>465/tcp</strong>. How this can be checked has been described
 +previously.</p>
 +</div>
 +<div class="section" id="how-can-i-find-out-if-a-smtp-server-supports-the-tls-protocol">
 +<h3>How can I find out if a SMTP server supports the TLS protocol?<a class="headerlink" href="#how-can-i-find-out-if-a-smtp-server-supports-the-tls-protocol" title="Permalink to this headline">¶</a></h3>
 +<p>A SMTP server usually announces the availability of STARTTLS right after a
 +connection has been established. This can easily been checked with the telnet command. You need to enter the marked lines to get the information displayed:</p>
 +<div class="highlight-python"><pre>telnet smtp.domain.dom 25</pre>
 +</div>
 +<div class="highlight-python"><pre>Trying 192.168.1.10...
 +Connected to smtp.domain.dom.
 +Escape character is '^]'.
 +220 smtp.domain.dom ESMTP Exim 4.80.1 Tue, 22 Jan 2013 22:39:55 +0100
 +EHLO your-server.local.lan                                             # <<< enter this command
 +250-smtp.domain.dom Hello your-server.local.lan [ip-address]
 +250-SIZE 52428800
 +250-8BITMIME
 +250-PIPELINING
 +250-AUTH PLAIN LOGIN CRAM-MD5
 +250-STARTTLS                                                           # <<< STARTTLS is supported!
 +250 HELP
 +QUIT                                                                   # <<< enter this command
 +221 smtp.domain.dom closing connection
 +Connection closed by foreign host.</pre>
 +</div>
 +</div>
 +<div class="section" id="how-can-i-find-out-which-authentication-types-methods-a-smtp-server-supports">
 +<h3>How can I find out which authentication types/methods a SMTP server supports?<a class="headerlink" href="#how-can-i-find-out-which-authentication-types-methods-a-smtp-server-supports" title="Permalink to this headline">¶</a></h3>
 +<p>A SMTP server usually announces the available authentication types/methods
 +right after a connection has been established. This can easily been checked
 +with the telnet command. You need to enter the marked lines to get the
 +information displayed:</p>
 +<div class="highlight-python"><pre>telnet smtp.domain.dom 25</pre>
 +</div>
 +<div class="highlight-python"><pre>Trying 192.168.1.10...
 +Connected to smtp.domain.dom.
 +Escape character is '^]'.
 +220 smtp.domain.dom ESMTP Exim 4.80.1 Tue, 22 Jan 2013 22:39:55 +0100
 +EHLO your-server.local.lan                                             # <<< enter this command
 +250-smtp.domain.dom Hello your-server.local.lan [ip-address]
 +250-SIZE 52428800
 +250-8BITMIME
 +250-PIPELINING
 +250-AUTH PLAIN LOGIN CRAM-MD5                                          # <<< available Authentication types
 +250-STARTTLS
 +250 HELP
 +QUIT                                                                   # <<< enter this command
 +221 smtp.domain.dom closing connection
 +Connection closed by foreign host.</pre>
 +</div>
 +</div>
 +<div class="section" id="enable-debug-mode">
 +<h3>Enable Debug Mode<a class="headerlink" href="#enable-debug-mode" title="Permalink to this headline">¶</a></h3>
 +<p>If you are still not able to send email it might be useful to activate
 +further debug messages by setting the following parameter. Right after
 +you have pressed the <strong>Reset password</strong> button, as described before, a
 +lot of <strong>SMTP -> get_lines(): ...</strong> messages will be written on the
 +screen.</p>
 +<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
 +
 +  <span class="s2">"mail_smtpdebug"</span> <span class="o">=></span> <span class="k">true</span><span class="p">;</span>
 +</pre></div>
 +</div>
 +</div>
 +</div>
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/configuration/configuration_maintenance.html
index 522d3f3,0000000..b95db0c
mode 100644,000000..100644
--- a/core/doc/admin/configuration/configuration_maintenance.html
+++ b/core/doc/admin/configuration/configuration_maintenance.html
@@@ -1,188 -1,0 +1,191 @@@
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>Enable Maintenance Mode — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '../',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="../_static/jquery.js"></script>
 +    <script type="text/javascript" src="../_static/underscore.js"></script>
 +    <script type="text/javascript" src="../_static/doctools.js"></script>
 +    <script type="text/javascript" src="../_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
 +    <link rel="up" title="Configuration" href="index.html" />
 +    <link rel="next" title="Enabling File Previews" href="configuration_preview.html" />
 +    <link rel="prev" title="Sending Mail Notifications" href="configuration_mail.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="../contents.html">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
 +<ul class="current">
 +<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
 +<li class="toctree-l1 current"><a class="reference internal" href="index.html">Configuration</a><ul class="current">
 +<li class="toctree-l2"><a class="reference internal" href="configuration_apps.html">Managing Apps</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_users.html">User Management</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="auth_ldap.html">LDAP Authentication</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="background_jobs.html">Background Jobs</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_3rdparty.html">Find Third-Party Libraries</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_automation.html">Automatic Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_custom_clients.html">Customizing Client Download Links</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_database.html">MySQL/Postgres/SQLite Support</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_encryption.html">Using Server-Side Encryption</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_knowledgebase.html">Disable Knowledge Base</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_language.html">Setting the Default Language</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_logging.html">Configure Logging</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_mail.html">Sending Mail Notifications</a></li>
 +<li class="toctree-l2 current"><a class="current reference internal" href="">Enable Maintenance Mode</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="#parameters">Parameters</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_preview.html">Enabling File Previews</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_reverseproxy.html">Reverse Proxy Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html">Dealing with Big File Uploads</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="custom_mount_config_gui.html">Custom Mount Configuration Web-GUI</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="custom_mount_config.html">Custom Mount Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="custom_user_backend.html">Custom User Backend Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="xsendfile.html">Serving static files via web server</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l1"><a class="reference internal" href="../apps/index.html">Apps</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../sharing_api/index.html">Sharing API</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../config/index.html">The Configuration File</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <div class="section" id="enable-maintenance-mode">
 +<h1>Enable Maintenance Mode<a class="headerlink" href="#enable-maintenance-mode" title="Permalink to this headline">¶</a></h1>
 +<p>If you want to prevent users to login to ownCloud before you start doing
 +some maintenance work, you need to set the value of the <strong>maintenance</strong>
 +parameter to <em>true</em>. Please keep in mind that users who are already logged-in
 +are kicked out of ownCloud instantly.</p>
 +<div class="section" id="parameters">
 +<h2>Parameters<a class="headerlink" href="#parameters" title="Permalink to this headline">¶</a></h2>
 +<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
 +
 +  <span class="s2">"maintenance"</span> <span class="o">=></span> <span class="k">false</span><span class="p">,</span>
 +</pre></div>
 +</div>
 +<p>This parameters can be set in the <tt class="file docutils literal"><span class="pre">config/config.php</span></tt></p>
 +</div>
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/configuration/configuration_preview.html
index e00262d,0000000..8df7371
mode 100644,000000..100644
--- a/core/doc/admin/configuration/configuration_preview.html
+++ b/core/doc/admin/configuration/configuration_preview.html
@@@ -1,283 -1,0 +1,286 @@@
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>Enabling File Previews — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '../',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="../_static/jquery.js"></script>
 +    <script type="text/javascript" src="../_static/underscore.js"></script>
 +    <script type="text/javascript" src="../_static/doctools.js"></script>
 +    <script type="text/javascript" src="../_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
 +    <link rel="up" title="Configuration" href="index.html" />
 +    <link rel="next" title="Reverse Proxy Configuration" href="configuration_reverseproxy.html" />
 +    <link rel="prev" title="Enable Maintenance Mode" href="configuration_maintenance.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="../contents.html">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
 +<ul class="current">
 +<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
 +<li class="toctree-l1 current"><a class="reference internal" href="index.html">Configuration</a><ul class="current">
 +<li class="toctree-l2"><a class="reference internal" href="configuration_apps.html">Managing Apps</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_users.html">User Management</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="auth_ldap.html">LDAP Authentication</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="background_jobs.html">Background Jobs</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_3rdparty.html">Find Third-Party Libraries</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_automation.html">Automatic Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_custom_clients.html">Customizing Client Download Links</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_database.html">MySQL/Postgres/SQLite Support</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_encryption.html">Using Server-Side Encryption</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_knowledgebase.html">Disable Knowledge Base</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_language.html">Setting the Default Language</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_logging.html">Configure Logging</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_mail.html">Sending Mail Notifications</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_maintenance.html">Enable Maintenance Mode</a></li>
 +<li class="toctree-l2 current"><a class="current reference internal" href="">Enabling File Previews</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="#soft-dependencies">Soft dependencies:</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="#parameters">Parameters</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_reverseproxy.html">Reverse Proxy Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html">Dealing with Big File Uploads</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="custom_mount_config_gui.html">Custom Mount Configuration Web-GUI</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="custom_mount_config.html">Custom Mount Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="custom_user_backend.html">Custom User Backend Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="xsendfile.html">Serving static files via web server</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l1"><a class="reference internal" href="../apps/index.html">Apps</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../sharing_api/index.html">Sharing API</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../config/index.html">The Configuration File</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <div class="section" id="enabling-file-previews">
 +<h1>Enabling File Previews<a class="headerlink" href="#enabling-file-previews" title="Permalink to this headline">¶</a></h1>
 +<p>ownCloud 6 introduced the new thumbnail system. It is used to generate
 +thumbnails from various file types.  By default, it can generate previews for:</p>
 +<ul class="simple">
 +<li>Images</li>
 +<li>Movies</li>
 +<li>Cover from mp3 files</li>
 +<li>various office files</li>
 +<li>Pdf</li>
 +<li>Svg</li>
 +<li>Text</li>
 +</ul>
 +<div class="section" id="soft-dependencies">
 +<h2>Soft dependencies:<a class="headerlink" href="#soft-dependencies" title="Permalink to this headline">¶</a></h2>
 +<div class="section" id="imagick">
 +<h3>imagick:<a class="headerlink" href="#imagick" title="Permalink to this headline">¶</a></h3>
 +<p>ownCloud needs the imagick php extension to generate previews from office, pdf
 +and svg files. For further information on how to install the imagick php
 +extension on your system take a look at the <a class="reference external" href="http://www.php.net/manual/en/imagick.installation.php">PHP documentation</a>.
 +If imagick is not installed, ownCloud will show file type icons instead of previews.</p>
 +</div>
 +<div class="section" id="libreoffice-openoffice">
 +<h3>LibreOffice / OpenOffice:<a class="headerlink" href="#libreoffice-openoffice" title="Permalink to this headline">¶</a></h3>
 +<p>ownCloud comes with a php-only preview system for office files. But this
 +preview system has limited capabilities and is only able to create previews
 +from basic Microsoft Office files. If you need previews from advanced
 +Microsoft Office files or OpenDocument files, you have to install LibreOffice
 +or OpenOffice. To learn more about installing LibreOffice/OpenOffice consider
 +your distribution’s documentation.</p>
 +</div>
 +<div class="section" id="avconv-ffmpeg">
 +<h3>avconv / ffmpeg:<a class="headerlink" href="#avconv-ffmpeg" title="Permalink to this headline">¶</a></h3>
 +<p>ownCloud requires avconv of ffmpeg to generate previews from movies. To learn
 +more about installing avconv or ffmpeg consider your distribution’s
 +documentation.</p>
 +</div>
 +</div>
 +<div class="section" id="parameters">
 +<h2>Parameters<a class="headerlink" href="#parameters" title="Permalink to this headline">¶</a></h2>
 +<div class="section" id="disabling-previews">
 +<h3>Disabling previews:<a class="headerlink" href="#disabling-previews" title="Permalink to this headline">¶</a></h3>
 +<p>Under certain circumstances like a big user base or limited resources you might
 +want to consider disabling previews.</p>
 +<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
 +  <span class="s1">'enable_previews'</span> <span class="o">=></span> <span class="k">true</span><span class="p">,</span>
 +</pre></div>
 +</div>
 +<p>There is a config option called ‘enable_previews’. By default it’s set to true.
 +You can disable previews by setting this option to false:</p>
 +<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
 +  <span class="s1">'enable_previews'</span> <span class="o">=></span> <span class="k">false</span><span class="p">,</span>
 +</pre></div>
 +</div>
 +</div>
 +<div class="section" id="maximum-preview-size">
 +<h3>Maximum preview size:<a class="headerlink" href="#maximum-preview-size" title="Permalink to this headline">¶</a></h3>
 +<p>There are two config options to set the maximum size of a preview.</p>
 +<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
 +  <span class="s1">'preview_max_x'</span> <span class="o">=></span> <span class="k">null</span><span class="p">,</span>
 +  <span class="s1">'preview_max_y'</span> <span class="o">=></span> <span class="k">null</span><span class="p">,</span>
 +</pre></div>
 +</div>
 +<p>By default, both config options are set to null. ‘Null’ is equal to no limit.
 +Numeric values represent the size in pixel. The following code limits previews
 +to a maximum size of 100px by 100px:</p>
 +<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
 +  <span class="s1">'preview_max_x'</span> <span class="o">=></span> <span class="mi">100</span><span class="p">,</span>
 +  <span class="s1">'preview_max_y'</span> <span class="o">=></span> <span class="mi">100</span><span class="p">,</span>
 +</pre></div>
 +</div>
 +<p>‘preview_max_x’ represents the x-axis and ‘preview_max_y’ represents the y-axis.</p>
 +</div>
 +<div class="section" id="maximum-scale-factor">
 +<h3>Maximum scale factor:<a class="headerlink" href="#maximum-scale-factor" title="Permalink to this headline">¶</a></h3>
 +<p>If you have a lot of small pictures and the preview system generates blurry
 +previews, you might want to consider setting a maximum scale factor. By default,
 +ownCloud scales pictures up to 10 times the original size:</p>
 +<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
 +  <span class="s1">'preview_max_scale_factor'</span> <span class="o">=></span> <span class="mi">10</span><span class="p">,</span>
 +</pre></div>
 +</div>
 +<p>If you want to disable scaling at all, you can set the config value to ‘1’:</p>
 +<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
 +  <span class="s1">'preview_max_scale_factor'</span> <span class="o">=></span> <span class="mi">1</span><span class="p">,</span>
 +</pre></div>
 +</div>
 +<p>If you want to disable the maximum scaling factor, you can set the config value to ‘null’:</p>
 +<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
 +  <span class="s1">'preview_max_scale_factor'</span> <span class="o">=></span> <span class="k">null</span><span class="p">,</span>
 +</pre></div>
 +</div>
 +</div>
 +<div class="section" id="id1">
 +<h3>LibreOffice / OpenOffice:<a class="headerlink" href="#id1" title="Permalink to this headline">¶</a></h3>
 +<p>You can set a custom path for the LibreOffice binary. If LibreOffice is not yet
 +available on your system, you can also use OpenOffice instead.</p>
 +<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
 +  <span class="s1">'preview_libreoffice_path'</span> <span class="o">=></span> <span class="s1">'/usr/bin/libreoffice'</span><span class="p">,</span>
 +</pre></div>
 +</div>
 +<p>You can set custom LibreOffice / OpenOffice command line parameters by setting
 +the preview_office_cl_parameters option.</p>
 +<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
 +  <span class="s1">'preview_office_cl_parameters'</span> <span class="o">=></span> <span class="s1">' '</span><span class="p">,</span>
 +</pre></div>
 +</div>
 +</div>
 +</div>
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/configuration/configuration_reverseproxy.html
index d436bfa,0000000..e6d4814
mode 100644,000000..100644
--- a/core/doc/admin/configuration/configuration_reverseproxy.html
+++ b/core/doc/admin/configuration/configuration_reverseproxy.html
@@@ -1,220 -1,0 +1,223 @@@
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>Reverse Proxy Configuration — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '../',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="../_static/jquery.js"></script>
 +    <script type="text/javascript" src="../_static/underscore.js"></script>
 +    <script type="text/javascript" src="../_static/doctools.js"></script>
 +    <script type="text/javascript" src="../_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
 +    <link rel="up" title="Configuration" href="index.html" />
 +    <link rel="next" title="Dealing with Big File Uploads" href="configuring_big_file_upload.html" />
 +    <link rel="prev" title="Enabling File Previews" href="configuration_preview.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="../contents.html">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
 +<ul class="current">
 +<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
 +<li class="toctree-l1 current"><a class="reference internal" href="index.html">Configuration</a><ul class="current">
 +<li class="toctree-l2"><a class="reference internal" href="configuration_apps.html">Managing Apps</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_users.html">User Management</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="auth_ldap.html">LDAP Authentication</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="background_jobs.html">Background Jobs</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_3rdparty.html">Find Third-Party Libraries</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_automation.html">Automatic Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_custom_clients.html">Customizing Client Download Links</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_database.html">MySQL/Postgres/SQLite Support</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_encryption.html">Using Server-Side Encryption</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_knowledgebase.html">Disable Knowledge Base</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_language.html">Setting the Default Language</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_logging.html">Configure Logging</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_mail.html">Sending Mail Notifications</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_maintenance.html">Enable Maintenance Mode</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_preview.html">Enabling File Previews</a></li>
 +<li class="toctree-l2 current"><a class="current reference internal" href="">Reverse Proxy Configuration</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="#parameters">Parameters</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="#example">Example</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html">Dealing with Big File Uploads</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="custom_mount_config_gui.html">Custom Mount Configuration Web-GUI</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="custom_mount_config.html">Custom Mount Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="custom_user_backend.html">Custom User Backend Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="xsendfile.html">Serving static files via web server</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l1"><a class="reference internal" href="../apps/index.html">Apps</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../sharing_api/index.html">Sharing API</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../config/index.html">The Configuration File</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <div class="section" id="reverse-proxy-configuration">
 +<h1>Reverse Proxy Configuration<a class="headerlink" href="#reverse-proxy-configuration" title="Permalink to this headline">¶</a></h1>
 +<p>The automatic hostname, protocol or webroot detection of ownCloud can fail in
 +certain reverse proxy situations. This configuration allows to manually override
 +the automatic detection.</p>
 +<div class="section" id="parameters">
 +<h2>Parameters<a class="headerlink" href="#parameters" title="Permalink to this headline">¶</a></h2>
 +<p>If ownCloud fails to automatically detected the hostname, protocol or webroot
 +you can use the <strong>overwrite</strong> parameters inside the <tt class="file docutils literal"><span class="pre">config/config.php</span></tt>.
 +The <strong>overwritehost</strong> parameter is used to set the hostname of the proxy. You
 +can also specify a port. The <strong>overwriteprotocol</strong> parameter is used to set the
 +protocol of the proxy. You can choose between the two options <strong>http</strong> and
 +<strong>https</strong>. The <strong>overwritewebroot</strong> parameter is used to set the absolute web
 +path of the proxy to the ownCloud folder. When you want to keep the automatic
 +detection of one of the three parameters you can leave the value empty or don’t
 +set it. The <strong>overwritecondaddr</strong> parameter is used to overwrite the values
 +dependent on the remote address. The value must be a <strong>regular expression</strong> of
 +the IP addresses of the proxy. This is useful when you use a reverse SSL proxy
 +only for https access and you want to use the automatic detection for http
 +access.</p>
 +</div>
 +<div class="section" id="example">
 +<h2>Example<a class="headerlink" href="#example" title="Permalink to this headline">¶</a></h2>
 +<div class="section" id="multiple-domains-reverse-ssl-proxy">
 +<h3>Multiple Domains Reverse SSL Proxy<a class="headerlink" href="#multiple-domains-reverse-ssl-proxy" title="Permalink to this headline">¶</a></h3>
 +<p>If you want to access your ownCloud installation <strong>http://domain.tld/owncloud</strong>
 +via a multiple domains reverse SSL proxy
 +<strong>https://ssl-proxy.tld/domain.tld/owncloud</strong> with the IP address <strong>10.0.0.1</strong>
 +you can set the following parameters inside the <tt class="file docutils literal"><span class="pre">config/config.php</span></tt>.</p>
 +<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
 +<span class="nv">$CONFIG</span> <span class="o">=</span> <span class="k">array</span> <span class="p">(</span>
 +  <span class="s2">"overwritehost"</span>     <span class="o">=></span> <span class="s2">"ssl-proxy.tld"</span><span class="p">,</span>
 +  <span class="s2">"overwriteprotocol"</span> <span class="o">=></span> <span class="s2">"https"</span><span class="p">,</span>
 +  <span class="s2">"overwritewebroot"</span>  <span class="o">=></span> <span class="s2">"/domain.tld/owncloud"</span><span class="p">,</span>
 +  <span class="s2">"overwritecondaddr"</span> <span class="o">=></span> <span class="s2">"^10\.0\.0\.1$"</span><span class="p">,</span>
 +<span class="p">);</span>
 +</pre></div>
 +</div>
 +<div class="admonition note">
 +<p class="first admonition-title">Note</p>
 +<p class="last">If you want to use the SSL proxy during installation you have to
 +create the <tt class="file docutils literal"><span class="pre">config/config.php</span></tt> otherwise you have to extend to existing
 +<strong>$CONFIG</strong> array.</p>
 +</div>
 +</div>
 +</div>
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/configuration/configuration_users.html
index 6ea33cf,0000000..2355e33
mode 100644,000000..100644
--- a/core/doc/admin/configuration/configuration_users.html
+++ b/core/doc/admin/configuration/configuration_users.html
@@@ -1,379 -1,0 +1,382 @@@
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>User Management — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '../',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="../_static/jquery.js"></script>
 +    <script type="text/javascript" src="../_static/underscore.js"></script>
 +    <script type="text/javascript" src="../_static/doctools.js"></script>
 +    <script type="text/javascript" src="../_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
 +    <link rel="up" title="Configuration" href="index.html" />
 +    <link rel="next" title="LDAP Authentication" href="auth_ldap.html" />
 +    <link rel="prev" title="Managing Apps" href="configuration_apps.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="../contents.html">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
 +<ul class="current">
 +<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
 +<li class="toctree-l1 current"><a class="reference internal" href="index.html">Configuration</a><ul class="current">
 +<li class="toctree-l2"><a class="reference internal" href="configuration_apps.html">Managing Apps</a></li>
 +<li class="toctree-l2 current"><a class="current reference internal" href="">User Management</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="#users">Users</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="#user-groups">User Groups</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="auth_ldap.html">LDAP Authentication</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="background_jobs.html">Background Jobs</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_3rdparty.html">Find Third-Party Libraries</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_automation.html">Automatic Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_custom_clients.html">Customizing Client Download Links</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_database.html">MySQL/Postgres/SQLite Support</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_encryption.html">Using Server-Side Encryption</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_knowledgebase.html">Disable Knowledge Base</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_language.html">Setting the Default Language</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_logging.html">Configure Logging</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_mail.html">Sending Mail Notifications</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_maintenance.html">Enable Maintenance Mode</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_preview.html">Enabling File Previews</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_reverseproxy.html">Reverse Proxy Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html">Dealing with Big File Uploads</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="custom_mount_config_gui.html">Custom Mount Configuration Web-GUI</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="custom_mount_config.html">Custom Mount Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="custom_user_backend.html">Custom User Backend Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="xsendfile.html">Serving static files via web server</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l1"><a class="reference internal" href="../apps/index.html">Apps</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../sharing_api/index.html">Sharing API</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../config/index.html">The Configuration File</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <div class="section" id="user-management">
 +<h1>User Management<a class="headerlink" href="#user-management" title="Permalink to this headline">¶</a></h1>
 +<p>ownCloud administrators can easily manage users via the web interface. To go into
 +user management page, click your username on the web interface and select <em>Users</em>.
 +A page similar to the image below will be shown:</p>
 +<div class="figure">
 +<img alt="../_images/oc_admin_user_manage.png" src="../_images/oc_admin_user_manage.png" />
 +</div>
 +<p>Users management page</p>
 +<p>A fictive use case will help you understand the concept of users, user groups
 +and group admins.</p>
 +<p>Think of a small, 25-member staff company, named “Cloud Lovers”, that is lead
 +by its founder Richard. In this company Bob acts as IT operator and recently
 +set up ownCloud. Being the installing user, Bob is member of the so called
 +“admin” user group of ownCloud. His colleague Tom, who provides support if Bob
 +is on holiday, is member of the “admin” user group as well. All employees,
 +including Bob and Tom, are members of the user group “Internal”, that is used
 +to share data across the company. Mostly for operational data, that should not
 +be accessible to all employees, Bob created the “Administration” user group
 +having two members: Richard and his assistant Susan. Richard is group admin of
 +this user group, so he can manage the members of the “Administration” user
 +group on his own.</p>
 +<div class="section" id="users">
 +<h2>Users<a class="headerlink" href="#users" title="Permalink to this headline">¶</a></h2>
 +<p>A user represents an account of the ownCloud installation. In this section the
 +core properties are listed.</p>
 +<dl class="docutils">
 +<dt><em>Login name (Username)</em></dt>
 +<dd>This is the unique ID of a ownCloud user (e.g. test, jon.doe).</dd>
 +<dt><em>Full Name</em></dt>
 +<dd>This is the name that is used all over the user interface to identify the
 +user i.e. when sharing data or sending mails. If no display name is set, it
 +defaults to the login name.</dd>
 +<dt><em>Password</em></dt>
 +<dd>This is the password the user uses to login to ownCloud.</dd>
 +<dt><em>Groups</em></dt>
 +<dd>This is a list of security groups the user is assigned to. By default the
 +user is not member of any user group.</dd>
 +<dt><em>Group Admin</em></dt>
 +<dd>This is a list of security groups the user has administration privileges for.
 +By default the user is not registered as group admin for any user group.</dd>
 +<dt><em>Storage</em></dt>
 +<dd>This is the maximum disk space that may be used by the user. If the user
 +reaches this limit he/she is not able to upload or sync further data. The
 +storage quota is specified in the format <em>Number Unit</em> (e.g. 100 B (byte),
 +50 KB (kilobyte), 20 MB (megabyte), 5 GB (gigabyte)). If no unit is given,
 +the number is interpreted as bytes.</dd>
 +</dl>
 +<p>Each user is able to change its display name and password.</p>
 +<div class="section" id="create-a-user">
 +<h3>Create a user<a class="headerlink" href="#create-a-user" title="Permalink to this headline">¶</a></h3>
 +<p>Before users can sign in and share data, they need ownCloud user accounts.</p>
 +<p>To create a user account:</p>
 +<ol class="arabic">
 +<li><p class="first">Enter the new user’s <strong>Login Name</strong> and its initial <strong>Password</strong> in the
 +appropriate fields.</p>
 +</li>
 +<li><p class="first">(Optional) Select the <strong>Groups</strong> to which you want to assign the new user.</p>
 +</li>
 +<li><p class="first">Click <strong>Create</strong>.</p>
 +</li>
 +<li><p class="first">(Optional) Edit additional user settings.</p>
 +<p>To set other user settings, such as setting a display name or limiting the
 +user’s storage, see instructions as follows.</p>
 +</li>
 +</ol>
 +<p>Created users will have the storage specified on <em>Default Storage</em> setting
 +on the same page.</p>
 +<p>Login names may contain letters (a-z, A-Z), numbers (0-9), dashes (-),
 +underscores (_), periods (.) and at signs (@).</p>
 +</div>
 +<div class="section" id="reset-a-user-s-password">
 +<h3>Reset a user’s password<a class="headerlink" href="#reset-a-user-s-password" title="Permalink to this headline">¶</a></h3>
 +<p>To reset a user’s password:</p>
 +<ol class="arabic simple">
 +<li>Hover the line of the user.</li>
 +<li>Click on the <strong>pencil icon</strong> next to the password field.</li>
 +<li>Enter the user’s new password in the password field and then hit the
 +<strong>Enter</strong> key of your keyboard.</li>
 +</ol>
 +<p>Remember to provide the user with the new login information after you have
 +reset the password.</p>
 +</div>
 +<div class="section" id="rename-a-user">
 +<h3>Rename a user<a class="headerlink" href="#rename-a-user" title="Permalink to this headline">¶</a></h3>
 +<p>Each ownCloud user has two names: an unique <em>login name</em> used for
 +authentication, and a <em>display name</em> (e.g. the user’s first name and last name)
 +used in the user interface. You can edit the display name of a user, but you
 +cannot change the login name of any user.</p>
 +<p>To set a user’s display name:</p>
 +<ol class="arabic simple">
 +<li>Hover the line of the user.</li>
 +<li>Click on the <strong>pencil icon</strong> next to the display name field.</li>
 +<li>Enter the user’s new display name in the corresponding field and then hit
 +the <strong>Enter</strong> key of your keyboard.</li>
 +</ol>
 +</div>
 +<div class="section" id="grant-administrator-privileges-to-a-user">
 +<h3>Grant administrator privileges to a user<a class="headerlink" href="#grant-administrator-privileges-to-a-user" title="Permalink to this headline">¶</a></h3>
 +<p>If a user has administrator privileges, the user has the right to manage other
 +users. Within ownCloud there are two types of administrators: <em>Super
 +Administrators</em> and <em>Group Administrators</em>.</p>
 +<p>Group administrators have the management rights to:</p>
 +<ul class="simple">
 +<li>Create new users and assign them to the group of the group administrator</li>
 +<li>Edit and delete users that are assigned to the group of the group
 +administrator</li>
 +</ul>
 +<p>Group administrators cannot access system settings or modify installation-wide
 +configuration like the default storage.</p>
 +<p>To assign the <em>super administrator</em> role to a user:</p>
 +<ol class="arabic simple">
 +<li>Use the drop-down list in <em>Groups</em> column of the user</li>
 +<li>Assign the user to the “admin” user group</li>
 +</ol>
 +<p>To assign the <em>group administrator</em> role to a user:</p>
 +<p>Find the user and select the user groups from the <strong>Group Admin</strong> drop-down
 +list you want the user become group administrator for.</p>
 +</div>
 +<div class="section" id="assign-a-user-to-a-user-group">
 +<h3>Assign a user to a user group<a class="headerlink" href="#assign-a-user-to-a-user-group" title="Permalink to this headline">¶</a></h3>
 +<p>To assign a user to a user group:</p>
 +<p>Find the user and select the user groups from the <strong>Groups</strong> drop-down list
 +you want to assign the user to. You can use <em>add group</em> link to create a new
 +group to assign the user to. You can assign the user more than one group by checking
 +multiple groups.</p>
 +<div class="admonition note">
 +<p class="first admonition-title">Note</p>
 +<p class="last">If a file/folder is shared with a group, newly created users will immediately
 +have access to the share.</p>
 +</div>
 +<div class="admonition note">
 +<p class="first admonition-title">Note</p>
 +<p class="last">If you assign a user to the <em>admin</em> user group, the user will become a
 +<em>Super Administrator</em> with unlimited privileges.</p>
 +</div>
 +</div>
 +<div class="section" id="limit-a-user-s-storage">
 +<h3>Limit a user’s storage<a class="headerlink" href="#limit-a-user-s-storage" title="Permalink to this headline">¶</a></h3>
 +<p>To limit a user’s storage quota:</p>
 +<p>Find the user and select an item from the <strong>Storage</strong> drop-down list.</p>
 +<blockquote>
 +<div><ul class="simple">
 +<li>If you select <em>Default</em>, the default storage limit, specified in the
 +action bar at the top, is applied.</li>
 +<li>If you select <em>Unlimited</em>, the user is not limited until the total disk
 +space is consumed.</li>
 +<li>If you want to enter a custom limit, select <em>Other...</em>, enter the storage
 +quota of your choice and hit the <strong>Enter</strong> key of your keyboard.</li>
 +</ul>
 +</div></blockquote>
 +<p>If you edit the value of the <strong>Default Storage</strong> field in the action bar, all
 +users with storage <em>Default</em> are affected by this change, i.e. changing the
 +default storage from <em>Unlimited</em> to <em>1 GB</em> will cause all users with <em>Default</em>
 +storage being limited to 1 GB storage each.</p>
 +</div>
 +<div class="section" id="delete-user">
 +<h3>Delete User<a class="headerlink" href="#delete-user" title="Permalink to this headline">¶</a></h3>
 +<p><strong>Important considerations before deleting a user:</strong></p>
 +<ul class="simple">
 +<li>The user will no longer be able to sign in to your ownCloud installation.</li>
 +<li>You cannot revert the deletion or restore a deleted account.</li>
 +</ul>
 +<div class="admonition note">
 +<p class="first admonition-title">Note</p>
 +<p class="last">If this user had a share with a group or user, the share also will
 +be deleted permanently.</p>
 +</div>
 +<p>To delete a user account:</p>
 +<ol class="arabic simple">
 +<li>Hover the line of the user you want to delete.</li>
 +<li>Click the <strong>cross icon</strong> at the end of the line.</li>
 +</ol>
 +<div class="admonition note">
 +<p class="first admonition-title">Note</p>
 +<p class="last">If you accidentally delete a user, you can use undo button shown on
 +notification bar at the top of the page.</p>
 +</div>
 +</div>
 +</div>
 +<div class="section" id="user-groups">
 +<h2>User Groups<a class="headerlink" href="#user-groups" title="Permalink to this headline">¶</a></h2>
 +<div class="section" id="create-group">
 +<h3>Create Group<a class="headerlink" href="#create-group" title="Permalink to this headline">¶</a></h3>
 +<p>To create a user group:</p>
 +<ol class="arabic simple">
 +<li>Open the <strong>Groups</strong> drop-down list in the action bar.</li>
 +<li>Click <strong>add group</strong>.</li>
 +<li>Enter the name of the new group and then hit the <strong>Enter</strong> key of your
 +keyboard.</li>
 +</ol>
 +<p>You can <em>assign users</em> to the newly created user groups anytime by using users’
 +group drop-down list.</p>
 +</div>
 +<div class="section" id="edit-delete-group">
 +<h3>Edit/Delete Group<a class="headerlink" href="#edit-delete-group" title="Permalink to this headline">¶</a></h3>
 +<p>Currently, groups cannot be edited (e.g. renamed) or removed. This feature
 +will be available in a future version of ownCloud.</p>
 +<div class="admonition note">
 +<p class="first admonition-title">Note</p>
 +<p class="last">If you have direct access to the database, you can manually delete the group
 +from database tables oc_groups and oc_group_user.</p>
 +</div>
 +</div>
 +</div>
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/configuration/configuring_big_file_upload.html
index 9da9933,0000000..e310392
mode 100644,000000..100644
--- a/core/doc/admin/configuration/configuring_big_file_upload.html
+++ b/core/doc/admin/configuration/configuring_big_file_upload.html
@@@ -1,225 -1,0 +1,228 @@@
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>Dealing with Big File Uploads — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '../',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="../_static/jquery.js"></script>
 +    <script type="text/javascript" src="../_static/underscore.js"></script>
 +    <script type="text/javascript" src="../_static/doctools.js"></script>
 +    <script type="text/javascript" src="../_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
 +    <link rel="up" title="Configuration" href="index.html" />
 +    <link rel="next" title="Custom Mount Configuration Web-GUI" href="custom_mount_config_gui.html" />
 +    <link rel="prev" title="Reverse Proxy Configuration" href="configuration_reverseproxy.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="../contents.html">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
 +<ul class="current">
 +<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
 +<li class="toctree-l1 current"><a class="reference internal" href="index.html">Configuration</a><ul class="current">
 +<li class="toctree-l2"><a class="reference internal" href="configuration_apps.html">Managing Apps</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_users.html">User Management</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="auth_ldap.html">LDAP Authentication</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="background_jobs.html">Background Jobs</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_3rdparty.html">Find Third-Party Libraries</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_automation.html">Automatic Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_custom_clients.html">Customizing Client Download Links</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_database.html">MySQL/Postgres/SQLite Support</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_encryption.html">Using Server-Side Encryption</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_knowledgebase.html">Disable Knowledge Base</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_language.html">Setting the Default Language</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_logging.html">Configure Logging</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_mail.html">Sending Mail Notifications</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_maintenance.html">Enable Maintenance Mode</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_preview.html">Enabling File Previews</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_reverseproxy.html">Reverse Proxy Configuration</a></li>
 +<li class="toctree-l2 current"><a class="current reference internal" href="">Dealing with Big File Uploads</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="#not-outnumberable-upload-limits">Not outnumberable upload limits:</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="#other-recommendable-preconditions">Other recommendable preconditions:</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="#enabling-uploading-big-files">Enabling uploading big files</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="custom_mount_config_gui.html">Custom Mount Configuration Web-GUI</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="custom_mount_config.html">Custom Mount Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="custom_user_backend.html">Custom User Backend Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="xsendfile.html">Serving static files via web server</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l1"><a class="reference internal" href="../apps/index.html">Apps</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../sharing_api/index.html">Sharing API</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../config/index.html">The Configuration File</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <div class="section" id="dealing-with-big-file-uploads">
 +<h1>Dealing with Big File Uploads<a class="headerlink" href="#dealing-with-big-file-uploads" title="Permalink to this headline">¶</a></h1>
 +<p>It’s useful to know limiting factors, that make it impossible to exceed the values given by the ownCloud-system:</p>
 +<div class="section" id="not-outnumberable-upload-limits">
 +<h2>Not outnumberable upload limits:<a class="headerlink" href="#not-outnumberable-upload-limits" title="Permalink to this headline">¶</a></h2>
 +<ul class="simple">
 +<li>< 2GB on 32Bit OS-architecture</li>
 +<li>< 2GB with Server Version 4.5 or older</li>
 +<li>< 2GB with IE6 - IE8</li>
 +<li>< 4GB with IE9 - IE10</li>
 +</ul>
 +</div>
 +<div class="section" id="other-recommendable-preconditions">
 +<h2>Other recommendable preconditions:<a class="headerlink" href="#other-recommendable-preconditions" title="Permalink to this headline">¶</a></h2>
 +<ul class="simple">
 +<li>Make sure, that the latest version of PHP (at least 5.4.9) is installed</li>
 +<li>Disable user quota. This means: set the user quota of the account, you are currently logged in, to “unlimited”.</li>
 +</ul>
 +<p>This is important, because you possibly could not watch otherwise, whether the desired changes take effect.</p>
 +</div>
 +<div class="section" id="enabling-uploading-big-files">
 +<h2>Enabling uploading big files<a class="headerlink" href="#enabling-uploading-big-files" title="Permalink to this headline">¶</a></h2>
 +<div class="admonition note">
 +<p class="first admonition-title">Note</p>
 +<p class="last">The order of the following steps is important! If you swap steps described below, the settings may fail.</p>
 +</div>
 +<p><strong>Go to the admin section in the ownCloud-WebUI and do the following:</strong></p>
 +<ul class="simple">
 +<li>Under “File handling” set the Maximum upload size to the desired value (e.g. 16GB)</li>
 +<li>Click the “save”-Button</li>
 +</ul>
 +<p><strong>Open the php.ini - file</strong></p>
 +<ul class="simple">
 +<li>Under Debian or SUSE and their derivatives this file resides at <tt class="docutils literal"><span class="pre">/etc/php5/apache2/php.ini</span></tt></li>
 +<li>On Windows, you can find this file within <tt class="docutils literal"><span class="pre">C:\Program</span> <span class="pre">Files</span> <span class="pre">(x86)\PHP\PHP.ini</span></tt></li>
 +</ul>
 +<p><strong>Do the following:</strong></p>
 +<ul class="simple">
 +<li>Set the following three parameters inside th php.ini to the same value as chosen inside the admin-section one step before:</li>
 +<li><tt class="docutils literal"><span class="pre">upload_max_filesize</span> <span class="pre">=</span> <span class="pre">16G</span></tt>   (e.g., to stay consistent with the example value above)</li>
 +<li><tt class="docutils literal"><span class="pre">post_max_size</span> <span class="pre">=</span> <span class="pre">16G</span></tt>   (e.g., to stay consistent with the example value above)</li>
 +<li><tt class="docutils literal"><span class="pre">output_buffering</span> <span class="pre">=</span> <span class="pre">16384</span></tt>  (e.g., to stay consistent with the example value above)</li>
 +</ul>
 +<p>whereas the “output_buffering” has to be given in MegaBytes but as a plain figure (without size-units as ‘M’ or ‘G’)</p>
 +<p>These client configurations have been proven by testing maximum file sizes of 16 GB:</p>
 +<ul class="simple">
 +<li>Linux 32 Bit: Ubuntu, Firefox => 16GB</li>
 +<li>Windows 8  64 Bit: Google Chrome => 8GB</li>
 +</ul>
 +</div>
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/configuration/custom_mount_config.html
index cdd282f,0000000..2b6874d
mode 100644,000000..100644
--- a/core/doc/admin/configuration/custom_mount_config.html
+++ b/core/doc/admin/configuration/custom_mount_config.html
@@@ -1,496 -1,0 +1,499 @@@
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>Custom Mount Configuration — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '../',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="../_static/jquery.js"></script>
 +    <script type="text/javascript" src="../_static/underscore.js"></script>
 +    <script type="text/javascript" src="../_static/doctools.js"></script>
 +    <script type="text/javascript" src="../_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
 +    <link rel="up" title="Configuration" href="index.html" />
 +    <link rel="next" title="Custom User Backend Configuration" href="custom_user_backend.html" />
 +    <link rel="prev" title="Custom Mount Configuration Web-GUI" href="custom_mount_config_gui.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="../contents.html">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
 +<ul class="current">
 +<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
 +<li class="toctree-l1 current"><a class="reference internal" href="index.html">Configuration</a><ul class="current">
 +<li class="toctree-l2"><a class="reference internal" href="configuration_apps.html">Managing Apps</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_users.html">User Management</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="auth_ldap.html">LDAP Authentication</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="background_jobs.html">Background Jobs</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_3rdparty.html">Find Third-Party Libraries</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_automation.html">Automatic Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_custom_clients.html">Customizing Client Download Links</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_database.html">MySQL/Postgres/SQLite Support</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_encryption.html">Using Server-Side Encryption</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_knowledgebase.html">Disable Knowledge Base</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_language.html">Setting the Default Language</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_logging.html">Configure Logging</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_mail.html">Sending Mail Notifications</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_maintenance.html">Enable Maintenance Mode</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_preview.html">Enabling File Previews</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_reverseproxy.html">Reverse Proxy Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html">Dealing with Big File Uploads</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="custom_mount_config_gui.html">Custom Mount Configuration Web-GUI</a></li>
 +<li class="toctree-l2 current"><a class="current reference internal" href="">Custom Mount Configuration</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="#example">Example</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="#backends">Backends</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="custom_user_backend.html">Custom User Backend Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="xsendfile.html">Serving static files via web server</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l1"><a class="reference internal" href="../apps/index.html">Apps</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../sharing_api/index.html">Sharing API</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../config/index.html">The Configuration File</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <div class="section" id="custom-mount-configuration">
 +<h1>Custom Mount Configuration<a class="headerlink" href="#custom-mount-configuration" title="Permalink to this headline">¶</a></h1>
 +<p>Since ownCloud 4.0 it is possible to configure the filesystem to mount external
 +storage providers into ownCloud’s virtual file system. You can configure these
 +file systems by creating and editing <tt class="file docutils literal"><span class="pre">data/mount.json</span></tt>. This file contains
 +all settings in JSON (JavaScript Object Notation) format. At the moment two
 +different types of entries exist:</p>
 +<ul class="simple">
 +<li><strong>Group mounts:</strong> each entry configures a mount for each user in group.</li>
 +<li><strong>User mounts:</strong> each entry configures a mount for a single user or for all
 +users.</li>
 +</ul>
 +<p>For each type, there is a JSON array with the user/group name as key, and an
 +array of configuration entries as value. Each entry consist of the class name
 +of the storage backend and an array of backend specific options and will be
 +replaced by the user login. The template <strong>$user</strong> can be used in the mount
 +point or backend options. As of writing the following storage backends are
 +available for use:</p>
 +<ul class="simple">
 +<li>Local file system</li>
 +<li>FTP (or FTPS)</li>
 +<li>SFTP</li>
 +<li>SMB</li>
 +<li>WebDAV</li>
 +<li><a class="reference external" href="http://aws.amazon.com/de/s3/">Amazon S3</a></li>
 +<li><a class="reference external" href="https://www.dropbox.com/">Dropbox</a></li>
 +<li><a class="reference external" href="https://drive.google.com/start">Google Drive</a></li>
 +<li><a class="reference external" href="http://openstack.org/projects/storage/">OpenStack Swift</a></li>
 +</ul>
 +<p>Please keep in mind that some formatting has been applied and carriage returns
 +have been added for better readability. In the <tt class="file docutils literal"><span class="pre">data/mount.json</span></tt> all
 +values need to be concatenated and written in a row without these modifications!</p>
 +<p>It is recommended to use the <a class="reference internal" href="custom_mount_config_gui.html"><em>Web-GUI</em></a> in the
 +administrator panel to add, remove or modify mount options to prevent any problems!</p>
 +<div class="section" id="example">
 +<h2>Example<a class="headerlink" href="#example" title="Permalink to this headline">¶</a></h2>
 +<div class="highlight-json"><pre>{"group":{
 +    "admin":{
 +        "\/$user\/files\/Admin_Stuff":{
 +            "class":"\\OC\\Files\\Storage\\Local",
 +            "options":{ ... }
 +            }
 +        }
 +    }
 + "user":{
 +    "all":{
 +        "\/$user\/files\/Pictures":{
 +            "class":"\\OC\\Files\\Storage\\DAV",
 +            "options":{ ... }
 +            }
 +        }
 +    "someuser":{
 +        "\/someuser\/files\/Music":{
 +            "class":"\\OC\\Files\\Storage\\FTP",
 +            "options":{ ... }
 +            }
 +        }
 +    }
 +}</pre>
 +</div>
 +</div>
 +<div class="section" id="backends">
 +<h2>Backends<a class="headerlink" href="#backends" title="Permalink to this headline">¶</a></h2>
 +<div class="section" id="local-filesystem">
 +<h3>Local Filesystem<a class="headerlink" href="#local-filesystem" title="Permalink to this headline">¶</a></h3>
 +<p>The local filesystem backend mounts a folder on the server into the virtual
 +filesystem, the class to be used is <strong>\OC\Files\Storage\Local</strong> and
 +takes the following options:</p>
 +<ul class="simple">
 +<li><strong>datadir</strong> : the path to the local directory to be mounted</li>
 +</ul>
 +<div class="section" id="id1">
 +<h4>Example<a class="headerlink" href="#id1" title="Permalink to this headline">¶</a></h4>
 +<div class="highlight-json"><div class="highlight"><pre><span class="p">{</span> <span class="nt">"class"</span><span class="p">:</span><span class="s2">"\\OC\\Files\\Storage\\Local"</span><span class="p">,</span>
 +  <span class="nt">"options"</span><span class="p">:{</span> <span class="nt">"datadir"</span><span class="p">:</span><span class="s2">"\/mnt\/additional_storage"</span> <span class="p">}</span>
 +<span class="p">}</span>
 +</pre></div>
 +</div>
 +<div class="admonition note">
 +<p class="first admonition-title">Note</p>
 +<p class="last">You must ensure that the web server has sufficient permissions on the folder.</p>
 +</div>
 +</div>
 +</div>
 +<div class="section" id="ftp-or-ftps">
 +<h3>FTP (or FTPS)<a class="headerlink" href="#ftp-or-ftps" title="Permalink to this headline">¶</a></h3>
 +<p>The FTP backend mounts a folder on a remote FTP server into the virtual
 +filesystem and is part of the ‘External storage support’ app, the class
 +to be used is <strong>\OC\Files\Storage\FTP</strong> and takes the following
 +options:</p>
 +<ul class="simple">
 +<li><strong>host</strong>: the hostname of the ftp server</li>
 +<li><strong>user</strong>: the username used to login on the ftp server</li>
 +<li><strong>password</strong>: the password to login on the ftp server</li>
 +<li><strong>secure</strong>: whether to use ftps:// (FTP over TLS) to connect to the ftp
 +server instead of ftp:// (optional, defaults to false)</li>
 +<li><strong>root</strong>: the folder inside the ftp server to mount (optional, defaults
 +to ‘/’)</li>
 +</ul>
 +<div class="section" id="id2">
 +<h4>Example<a class="headerlink" href="#id2" title="Permalink to this headline">¶</a></h4>
 +<div class="highlight-json"><div class="highlight"><pre><span class="p">{</span>   <span class="nt">"class"</span><span class="p">:</span><span class="s2">"\\OC\\Files\\Storage\\FTP"</span><span class="p">,</span>
 +    <span class="nt">"options"</span><span class="p">:{</span>
 +        <span class="nt">"host"</span><span class="p">:</span><span class="s2">"ftp.myhost.com"</span><span class="p">,</span>
 +        <span class="nt">"user"</span><span class="p">:</span><span class="s2">"johndoe"</span><span class="p">,</span>
 +        <span class="nt">"password"</span><span class="p">:</span><span class="s2">"secret"</span><span class="p">,</span>
 +        <span class="nt">"root"</span><span class="p">:</span><span class="s2">"\/Videos"</span><span class="p">,</span>
 +        <span class="nt">"secure"</span><span class="p">:</span><span class="s2">"false"</span>
 +    <span class="p">}</span>
 +<span class="p">}</span>
 +</pre></div>
 +</div>
 +<div class="admonition note">
 +<p class="first admonition-title">Note</p>
 +<p class="last">PHP needs to be build with FTP support for this backend to work.</p>
 +</div>
 +</div>
 +</div>
 +<div class="section" id="sftp">
 +<h3>SFTP<a class="headerlink" href="#sftp" title="Permalink to this headline">¶</a></h3>
 +<p>The SFTP backend mounts a folder on a remote SSH server into the virtual
 +filesystem and is part of the ‘External storage support’ app. The class
 +to be used is <strong>\OC\Files\Storage\SFTP</strong> and takes the following
 +options:</p>
 +<ul class="simple">
 +<li><strong>host</strong>: the hostname of the SSH server</li>
 +<li><strong>user</strong>: the username used to login to the SSH server</li>
 +<li><strong>password</strong>: the password to login on the SSH server</li>
 +<li><strong>root</strong>: the folder inside the SSH server to mount (optional, defaults
 +to ‘/’)</li>
 +</ul>
 +<div class="section" id="id3">
 +<h4>Example<a class="headerlink" href="#id3" title="Permalink to this headline">¶</a></h4>
 +<div class="highlight-json"><div class="highlight"><pre><span class="p">{</span>   <span class="nt">"class"</span><span class="p">:</span><span class="s2">"\\OC\\Files\\Storage\\SFTP"</span><span class="p">,</span>
 +    <span class="nt">"options"</span><span class="p">:{</span>
 +        <span class="nt">"host"</span><span class="p">:</span><span class="s2">"ssh.myhost.com"</span><span class="p">,</span>
 +        <span class="nt">"user"</span><span class="p">:</span><span class="s2">"johndoe"</span><span class="p">,</span>
 +        <span class="nt">"password"</span><span class="p">:</span><span class="s2">"secret"</span><span class="p">,</span>
 +        <span class="nt">"root"</span><span class="p">:</span><span class="s2">"\/Books"</span>
 +    <span class="p">}</span>
 +<span class="p">}</span>
 +</pre></div>
 +</div>
 +<div class="admonition note">
 +<p class="first admonition-title">Note</p>
 +<p class="last">PHP needs to be build with SFTP support for this backend to work.</p>
 +</div>
 +</div>
 +</div>
 +<div class="section" id="smb">
 +<h3>SMB<a class="headerlink" href="#smb" title="Permalink to this headline">¶</a></h3>
 +<p>The SMB backend mounts a folder on a remote Samba server, a NAS appliance or
 +a Windows machine into the virtual file system. It is part of the ‘External
 +storage support’ app, the class to be used is <strong>\OC\Files\Storage\SMB</strong> and
 +takes the following options:</p>
 +<ul class="simple">
 +<li><strong>host</strong>: the host name of the samba server</li>
 +<li><strong>user</strong>: the user name used to login on the samba server</li>
 +<li><strong>password</strong>: the password to login on the samba server</li>
 +<li><strong>share</strong>: the share on the samba server to mount</li>
 +<li><strong>root</strong>: the folder inside the samba share to mount (optional, defaults
 +to ‘/’)</li>
 +</ul>
 +<div class="admonition note">
 +<p class="first admonition-title">Note</p>
 +<p class="last">The SMB backend requires <strong>smbclient</strong> to be installed on the server.</p>
 +</div>
 +<div class="section" id="id4">
 +<h4>Example<a class="headerlink" href="#id4" title="Permalink to this headline">¶</a></h4>
 +<div class="highlight-json"><div class="highlight"><pre><span class="p">{</span>   <span class="nt">"class"</span><span class="p">:</span><span class="s2">"\\OC\\Files\\Storage\\SMB"</span><span class="p">,</span>
 +    <span class="nt">"options"</span><span class="p">:{</span>
 +        <span class="nt">"host"</span><span class="p">:</span><span class="s2">"myhost.com"</span><span class="p">,</span>
 +        <span class="nt">"user"</span><span class="p">:</span><span class="s2">"johndoe"</span><span class="p">,</span>
 +        <span class="nt">"password"</span><span class="p">:</span><span class="s2">"secret"</span><span class="p">,</span>
 +        <span class="nt">"share"</span><span class="p">:</span><span class="s2">"\/test"</span><span class="p">,</span>
 +        <span class="nt">"root"</span><span class="p">:</span><span class="s2">"\/Pictures"</span>
 +    <span class="p">}</span>
 +<span class="p">}</span>
 +</pre></div>
 +</div>
 +</div>
 +</div>
 +<div class="section" id="webdav">
 +<h3>WebDAV<a class="headerlink" href="#webdav" title="Permalink to this headline">¶</a></h3>
 +<p>The WebDAV backend mounts a folder on a remote WebDAV server into the
 +virtual filesystem and is part of the ‘External storage support’ app,
 +the class to be used is <strong>\OC\Files\Storage\DAV</strong> and takes the
 +following options:</p>
 +<ul class="simple">
 +<li><strong>host</strong>: the hostname of the webdav server.</li>
 +<li><strong>user</strong>: the username used to login on the webdav server</li>
 +<li><strong>password</strong>: the password to login on the webdav server</li>
 +<li><strong>secure</strong>: whether to use <a class="reference external" href="https://">https://</a> to connect to the webdav server
 +instead of <a class="reference external" href="http://">http://</a> (optional, defaults to false)</li>
 +<li><strong>root</strong>: the folder inside the webdav server to mount (optional,
 +defaults to ‘/’)</li>
 +</ul>
 +<div class="section" id="id5">
 +<h4>Example<a class="headerlink" href="#id5" title="Permalink to this headline">¶</a></h4>
 +<div class="highlight-json"><div class="highlight"><pre><span class="p">{</span>   <span class="nt">"class"</span><span class="p">:</span><span class="s2">"\\OC\\Files\\Storage\\DAV"</span><span class="p">,</span>
 +    <span class="nt">"options"</span><span class="p">:{</span>
 +        <span class="nt">"host"</span><span class="p">:</span><span class="s2">"myhost.com\/webdav.php"</span><span class="p">,</span>
 +        <span class="nt">"user"</span><span class="p">:</span><span class="s2">"johndoe"</span><span class="p">,</span>
 +        <span class="nt">"password"</span><span class="p">:</span><span class="s2">"secret"</span><span class="p">,</span>
 +        <span class="nt">"secure"</span><span class="p">:</span><span class="s2">"true"</span>
 +    <span class="p">}</span>
 +<span class="p">}</span>
 +</pre></div>
 +</div>
 +</div>
 +</div>
 +<div class="section" id="amazon-s3">
 +<h3>Amazon S3<a class="headerlink" href="#amazon-s3" title="Permalink to this headline">¶</a></h3>
 +<p>The Amazon S3 backend mounts a bucket in the Amazon cloud into the virtual
 +filesystem and is part of the ‘External storage support’ app, the class to
 +be used is <strong>\OC\Files\Storage\AmazonS3</strong> and takes the following
 +options:</p>
 +<ul class="simple">
 +<li><strong>key</strong>: the key to login to the Amazon cloud</li>
 +<li><strong>secret</strong>: the secret to login to the Amazon cloud</li>
 +<li><strong>bucket</strong>: the bucket in the Amazon cloud to mount</li>
 +</ul>
 +<div class="section" id="id6">
 +<h4>Example<a class="headerlink" href="#id6" title="Permalink to this headline">¶</a></h4>
 +<div class="highlight-json"><div class="highlight"><pre><span class="p">{</span>   <span class="nt">"class"</span><span class="p">:</span><span class="s2">"\\OC\\Files\\Storage\\AmazonS3"</span><span class="p">,</span>
 +    <span class="nt">"options"</span><span class="p">:{</span>
 +        <span class="nt">"key"</span><span class="p">:</span><span class="s2">"key"</span><span class="p">,</span>
 +        <span class="nt">"secret"</span><span class="p">:</span><span class="s2">"secret"</span><span class="p">,</span>
 +        <span class="nt">"bucket"</span><span class="p">:</span><span class="s2">"bucket"</span>
 +    <span class="p">}</span>
 +<span class="p">}</span>
 +</pre></div>
 +</div>
 +</div>
 +</div>
 +<div class="section" id="dropbox">
 +<h3>Dropbox<a class="headerlink" href="#dropbox" title="Permalink to this headline">¶</a></h3>
 +<p>The Dropbox backend mounts a dropbox in the Dropbox cloud into the virtual
 +filesystem and is part of the ‘External storage support’ app, the class to
 +be used is <strong>\OC\Files\Storage\Dropbox</strong> and takes the following options:</p>
 +<ul class="simple">
 +<li><strong>configured</strong>: whether the drive has been configured or not (true or false)</li>
 +<li><strong>app_key</strong>: the app key to login to your Dropbox</li>
 +<li><strong>app_secret</strong>: the app secret to login to your Dropbox</li>
 +<li><strong>token</strong>: the OAuth token to login to your Dropbox</li>
 +<li><strong>token_secret</strong>: the OAuth secret to login to your Dropbox</li>
 +</ul>
 +<div class="section" id="id7">
 +<h4>Example<a class="headerlink" href="#id7" title="Permalink to this headline">¶</a></h4>
 +<div class="highlight-json"><div class="highlight"><pre><span class="p">{</span>   <span class="nt">"class"</span><span class="p">:</span><span class="s2">"\\OC\\Files\\Storage\\Dropbox"</span><span class="p">,</span>
 +    <span class="nt">"options"</span><span class="p">:{</span>
 +        <span class="nt">"configured"</span><span class="p">:</span><span class="s2">"#configured"</span><span class="p">,</span>
 +        <span class="nt">"app_key"</span><span class="p">:</span><span class="s2">"key"</span><span class="p">,</span>
 +        <span class="nt">"app_secret"</span><span class="p">:</span><span class="s2">"secret"</span><span class="p">,</span>
 +        <span class="nt">"token"</span><span class="p">:</span><span class="s2">"#token"</span><span class="p">,</span>
 +        <span class="nt">"token_secret"</span><span class="p">:</span><span class="s2">"#token_secret"</span>
 +    <span class="p">}</span>
 +<span class="p">}</span>
 +</pre></div>
 +</div>
 +</div>
 +</div>
 +<div class="section" id="google-drive">
 +<h3>Google Drive<a class="headerlink" href="#google-drive" title="Permalink to this headline">¶</a></h3>
 +<p>The Google Drive backend mounts a share in the Google cloud into the virtual
 +filesystem and is part of the ‘External storage support’ app, the class to
 +be used is <strong>\OC\Files\Storage\Google</strong> and is done via an OAuth2.0 request.
 +That means that the App must be registered through the Google APIs Console.
 +The result of the registration process is a set of values (incl. client_id, client_secret).
 +It takes the following options:</p>
 +<ul class="simple">
 +<li><strong>configured</strong>: whether the drive has been configured or not (true or false)</li>
 +<li><strong>client_id</strong>: the client id to login to the Google drive</li>
 +<li><strong>client_secret</strong>: the client secret to login to the Google drive</li>
 +<li><strong>token</strong>: a compound value including access and refresh tokens</li>
 +</ul>
 +<div class="section" id="id8">
 +<h4>Example<a class="headerlink" href="#id8" title="Permalink to this headline">¶</a></h4>
 +<div class="highlight-json"><div class="highlight"><pre><span class="p">{</span>   <span class="nt">"class"</span><span class="p">:</span><span class="s2">"\\OC\\Files\\Storage\\Google"</span><span class="p">,</span>
 +    <span class="nt">"options"</span><span class="p">:{</span>
 +        <span class="nt">"configured"</span><span class="p">:</span><span class="s2">"#configured"</span><span class="p">,</span>
 +        <span class="nt">"client_id"</span><span class="p">:</span><span class="s2">"#client_id"</span><span class="p">,</span>
 +        <span class="nt">"client_secret"</span><span class="p">:</span><span class="s2">"#client_secret"</span><span class="p">,</span>
 +        <span class="nt">"token"</span><span class="p">:</span><span class="s2">"#token"</span>
 +    <span class="p">}</span>
 +<span class="p">}</span>
 +</pre></div>
 +</div>
 +</div>
 +</div>
 +<div class="section" id="openstack-swift">
 +<h3>OpenStack Swift<a class="headerlink" href="#openstack-swift" title="Permalink to this headline">¶</a></h3>
 +<p>The Swift backend mounts a container on an OpenStack Object Storage server
 +into the virtual filesystem and is part of the ‘External storage support’
 +app, the class to be used is <strong>\OC\Files\Storage\SWIFT</strong> and takes
 +the following options:</p>
 +<ul class="simple">
 +<li><strong>host</strong>: the hostname of the authentication server for the swift
 +storage.</li>
 +<li><strong>user</strong>: the username used to login on the swift server</li>
 +<li><strong>token</strong>: the authentication token to login on the swift server</li>
 +<li><strong>secure</strong>: whether to use ftps:// to connect to the swift server instead
 +of ftp:// (optional, defaults to false)</li>
 +<li><strong>root</strong>: the container inside the swift server to mount (optional,
 +defaults to ‘/’)</li>
 +</ul>
 +<div class="section" id="id9">
 +<h4>Example<a class="headerlink" href="#id9" title="Permalink to this headline">¶</a></h4>
 +<div class="highlight-json"><div class="highlight"><pre><span class="p">{</span>   <span class="nt">"class"</span><span class="p">:</span><span class="s2">"\\OC\\Files\\Storage\\SWIFT"</span><span class="p">,</span>
 +    <span class="nt">"options"</span><span class="p">:{</span>
 +        <span class="nt">"host"</span><span class="p">:</span><span class="s2">"swift.myhost.com\/auth"</span><span class="p">,</span>
 +        <span class="nt">"user"</span><span class="p">:</span><span class="s2">"johndoe"</span><span class="p">,</span>
 +        <span class="nt">"token"</span><span class="p">:</span><span class="s2">"secret"</span><span class="p">,</span>
 +        <span class="nt">"root"</span><span class="p">:</span><span class="s2">"\/Videos"</span><span class="p">,</span>
 +        <span class="nt">"secure"</span><span class="p">:</span><span class="s2">"true"</span>
 +    <span class="p">}</span>
 +<span class="p">}</span>
 +</pre></div>
 +</div>
 +</div>
 +</div>
 +</div>
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/configuration/custom_mount_config_gui.html
index 99c982c,0000000..aede0bc
mode 100644,000000..100644
--- a/core/doc/admin/configuration/custom_mount_config_gui.html
+++ b/core/doc/admin/configuration/custom_mount_config_gui.html
@@@ -1,236 -1,0 +1,239 @@@
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>Custom Mount Configuration Web-GUI — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '../',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="../_static/jquery.js"></script>
 +    <script type="text/javascript" src="../_static/underscore.js"></script>
 +    <script type="text/javascript" src="../_static/doctools.js"></script>
 +    <script type="text/javascript" src="../_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
 +    <link rel="up" title="Configuration" href="index.html" />
 +    <link rel="next" title="Custom Mount Configuration" href="custom_mount_config.html" />
 +    <link rel="prev" title="Dealing with Big File Uploads" href="configuring_big_file_upload.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="../contents.html">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
 +<ul class="current">
 +<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
 +<li class="toctree-l1 current"><a class="reference internal" href="index.html">Configuration</a><ul class="current">
 +<li class="toctree-l2"><a class="reference internal" href="configuration_apps.html">Managing Apps</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_users.html">User Management</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="auth_ldap.html">LDAP Authentication</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="background_jobs.html">Background Jobs</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_3rdparty.html">Find Third-Party Libraries</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_automation.html">Automatic Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_custom_clients.html">Customizing Client Download Links</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_database.html">MySQL/Postgres/SQLite Support</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_encryption.html">Using Server-Side Encryption</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_knowledgebase.html">Disable Knowledge Base</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_language.html">Setting the Default Language</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_logging.html">Configure Logging</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_mail.html">Sending Mail Notifications</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_maintenance.html">Enable Maintenance Mode</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_preview.html">Enabling File Previews</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_reverseproxy.html">Reverse Proxy Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html">Dealing with Big File Uploads</a></li>
 +<li class="toctree-l2 current"><a class="current reference internal" href="">Custom Mount Configuration Web-GUI</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="#id1">Dropbox</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="#id2">Google Drive</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="custom_mount_config.html">Custom Mount Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="custom_user_backend.html">Custom User Backend Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="xsendfile.html">Serving static files via web server</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l1"><a class="reference internal" href="../apps/index.html">Apps</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../sharing_api/index.html">Sharing API</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../config/index.html">The Configuration File</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <div class="section" id="custom-mount-configuration-web-gui">
 +<h1>Custom Mount Configuration Web-GUI<a class="headerlink" href="#custom-mount-configuration-web-gui" title="Permalink to this headline">¶</a></h1>
 +<p>Since ownCloud 5.0 it is possible to mount external storage providers into
 +ownCloud’s virtual file system. To add an external storage backend to your
 +ownCloud head to <em>Settings</em> -> <em>Admin</em> or <em>Personal</em>. As administrator you
 +can mount external storage for any group or user. Users are also allowed
 +to mount external storage for themselves if this setting has been enabled
 +by the administrator.</p>
 +<div class="figure">
 +<img alt="../_images/custom_mount_config_gui-1.png" src="../_images/custom_mount_config_gui-1.png" />
 +</div>
 +<p>At first the mount point has to be entered, this is the directory in ownCloud’s
 +virtual file system, that the storage will be mounted to. Then the storage
 +backend has to be selected from the list of supported backends. As of writing
 +ownCloud currently supports the following storage backends:</p>
 +<div class="figure">
 +<img alt="../_images/custom_mount_config_gui-2.png" src="../_images/custom_mount_config_gui-2.png" />
 +</div>
 +<ul class="simple">
 +<li>Local file system (mount local storage that is outside ownCloud’s data
 +directory)</li>
 +<li>FTP (or FTPS)</li>
 +<li>SFTP</li>
 +<li>SMB</li>
 +<li>WebDAV</li>
 +<li><a class="reference external" href="http://aws.amazon.com/de/s3/">Amazon S3</a></li>
 +<li><a class="reference external" href="https://www.dropbox.com/">Dropbox</a></li>
 +<li><a class="reference external" href="https://drive.google.com/start">Google Drive</a></li>
 +<li><a class="reference external" href="http://openstack.org/projects/storage/">OpenStack Swift</a></li>
 +</ul>
 +<p>Please keep in mind, that users are not allowed to mount local file storage for
 +security purposes.</p>
 +<div class="figure">
 +<img alt="../_images/custom_mount_config_gui-3.png" src="../_images/custom_mount_config_gui-3.png" />
 +</div>
 +<div class="figure">
 +<img alt="../_images/custom_mount_config_gui-4.png" src="../_images/custom_mount_config_gui-4.png" />
 +</div>
 +<p>Once a backend has been selected, more configuration fields will appear. The
 +displayed configuration fields may vary depending on the selected storage backend.
 +For example, the FTP storage backend needs the following configuration details
 +to be entered:</p>
 +<ul class="simple">
 +<li><strong>host</strong>: the hostname of the ftp server</li>
 +<li><strong>user</strong>: the username used to login to the ftp server</li>
 +<li><strong>password</strong>: the password to login to the ftp server</li>
 +<li><strong>secure</strong>: whether to use ftps:// (FTP over TLS) to connect to the ftp
 +server instead of ftp:// (optional, defaults to false)</li>
 +<li><strong>root</strong>: the name of the folder inside the ftp server to mount (optional,
 +defaults to ‘/’)</li>
 +</ul>
 +<div class="section" id="id1">
 +<h2>Dropbox<a class="headerlink" href="#id1" title="Permalink to this headline">¶</a></h2>
 +<p>Mounting a Dropbox account requires that you create an app with Dropbox and then provide the app key and secret to the
 +external storage configuration user interface. Go to My apps at Dropbox and create an app. Select <em>Full Dropbox</em> access
 +level. Copy the app key and app secret and paste them into the corresponding fields for the Dropbox storage.</p>
 +<p>Click the <em>Grant access</em> button and you will be redirected to a Dropbox website to give ownCloud permission to access your account.</p>
 +</div>
 +<div class="section" id="id2">
 +<h2>Google Drive<a class="headerlink" href="#id2" title="Permalink to this headline">¶</a></h2>
 +<p>For a detailed step-by-step guide read <a class="reference external" href="../../user_manual/external_storage/google_drive.html">User Manual</a></p>
 +</div>
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/configuration/custom_user_backend.html
index 3acff52,0000000..f915702
mode 100644,000000..100644
--- a/core/doc/admin/configuration/custom_user_backend.html
+++ b/core/doc/admin/configuration/custom_user_backend.html
@@@ -1,255 -1,0 +1,258 @@@
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>Custom User Backend Configuration — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '../',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="../_static/jquery.js"></script>
 +    <script type="text/javascript" src="../_static/underscore.js"></script>
 +    <script type="text/javascript" src="../_static/doctools.js"></script>
 +    <script type="text/javascript" src="../_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
 +    <link rel="up" title="Configuration" href="index.html" />
 +    <link rel="next" title="Serving static files via web server" href="xsendfile.html" />
 +    <link rel="prev" title="Custom Mount Configuration" href="custom_mount_config.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="../contents.html">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
 +<ul class="current">
 +<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
 +<li class="toctree-l1 current"><a class="reference internal" href="index.html">Configuration</a><ul class="current">
 +<li class="toctree-l2"><a class="reference internal" href="configuration_apps.html">Managing Apps</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_users.html">User Management</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="auth_ldap.html">LDAP Authentication</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="background_jobs.html">Background Jobs</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_3rdparty.html">Find Third-Party Libraries</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_automation.html">Automatic Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_custom_clients.html">Customizing Client Download Links</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_database.html">MySQL/Postgres/SQLite Support</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_encryption.html">Using Server-Side Encryption</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_knowledgebase.html">Disable Knowledge Base</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_language.html">Setting the Default Language</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_logging.html">Configure Logging</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_mail.html">Sending Mail Notifications</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_maintenance.html">Enable Maintenance Mode</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_preview.html">Enabling File Previews</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_reverseproxy.html">Reverse Proxy Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html">Dealing with Big File Uploads</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="custom_mount_config_gui.html">Custom Mount Configuration Web-GUI</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="custom_mount_config.html">Custom Mount Configuration</a></li>
 +<li class="toctree-l2 current"><a class="current reference internal" href="">Custom User Backend Configuration</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="#imap">IMAP</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="#smb">SMB</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="xsendfile.html">Serving static files via web server</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l1"><a class="reference internal" href="../apps/index.html">Apps</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../sharing_api/index.html">Sharing API</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../config/index.html">The Configuration File</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <div class="section" id="custom-user-backend-configuration">
 +<h1>Custom User Backend Configuration<a class="headerlink" href="#custom-user-backend-configuration" title="Permalink to this headline">¶</a></h1>
 +<p>Starting with ownCloud 4.5 is possible to configure additional user backends
 +in ownCloud’s configuration <tt class="file docutils literal"><span class="pre">config/config.php</span></tt> using the following
 +syntax:</p>
 +<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
 +
 +<span class="s2">"user_backends"</span> <span class="o">=></span> <span class="k">array</span> <span class="p">(</span>
 +    <span class="mi">0</span> <span class="o">=></span> <span class="k">array</span> <span class="p">(</span>
 +            <span class="s2">"class"</span>     <span class="o">=></span> <span class="o">...</span><span class="p">,</span>
 +            <span class="s2">"arguments"</span> <span class="o">=></span> <span class="k">array</span> <span class="p">(</span>
 +                              <span class="mi">0</span> <span class="o">=></span> <span class="o">...</span>
 +                              <span class="p">),</span>
 +    <span class="p">),</span>
 +<span class="p">),</span>
 +</pre></div>
 +</div>
 +<p>Currently the “External user support” (user_external) app provides the following user backends:</p>
 +<div class="section" id="imap">
 +<h2>IMAP<a class="headerlink" href="#imap" title="Permalink to this headline">¶</a></h2>
 +<p>Provides authentication against IMAP servers</p>
 +<ul class="simple">
 +<li><strong>Class:</strong> OC_User_IMAP</li>
 +<li><strong>Arguments:</strong>  a mailbox string as defined <a class="reference external" href="http://www.php.net/manual/en/function.imap-open.php">in the PHP documention</a></li>
 +<li><strong>Example:</strong></li>
 +</ul>
 +<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
 +
 +<span class="s2">"user_backends"</span> <span class="o">=></span> <span class="k">array</span> <span class="p">(</span>
 +    <span class="mi">0</span> <span class="o">=></span> <span class="k">array</span> <span class="p">(</span>
 +            <span class="s2">"class"</span>     <span class="o">=></span> <span class="s2">"OC_User_IMAP"</span><span class="p">,</span>
 +            <span class="s2">"arguments"</span> <span class="o">=></span> <span class="k">array</span> <span class="p">(</span>
 +                              <span class="mi">0</span> <span class="o">=></span> <span class="s1">'{imap.gmail.com:993/imap/ssl}'</span>
 +                              <span class="p">),</span>
 +    <span class="p">),</span>
 +<span class="p">),</span>
 +</pre></div>
 +</div>
 +</div>
 +<div class="section" id="smb">
 +<h2>SMB<a class="headerlink" href="#smb" title="Permalink to this headline">¶</a></h2>
 +<p>Provides authentication against Samba servers</p>
 +<ul class="simple">
 +<li><strong>Class:</strong> OC_User_SMB</li>
 +<li><strong>Arguments:</strong> the samba server to authenticate against</li>
 +<li><strong>Example:</strong></li>
 +</ul>
 +<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
 +
 +<span class="s2">"user_backends"</span> <span class="o">=></span> <span class="k">array</span> <span class="p">(</span>
 +    <span class="mi">0</span> <span class="o">=></span> <span class="k">array</span> <span class="p">(</span>
 +            <span class="s2">"class"</span>     <span class="o">=></span> <span class="s2">"OC_User_SMB"</span><span class="p">,</span>
 +            <span class="s2">"arguments"</span> <span class="o">=></span> <span class="k">array</span> <span class="p">(</span>
 +                              <span class="mi">0</span> <span class="o">=></span> <span class="s1">'localhost'</span>
 +                              <span class="p">),</span>
 +    <span class="p">),</span>
 +<span class="p">),</span>
 +</pre></div>
 +</div>
 +<div class="section" id="ftp">
 +<h3>FTP<a class="headerlink" href="#ftp" title="Permalink to this headline">¶</a></h3>
 +<p>Provides authentication against FTP servers</p>
 +<ul class="simple">
 +<li><strong>Class:</strong> OC_User_FTP</li>
 +<li><strong>Arguments:</strong> the FTP server to authenticate against</li>
 +<li><strong>Example:</strong></li>
 +</ul>
 +<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
 +
 +<span class="s2">"user_backends"</span> <span class="o">=></span> <span class="k">array</span> <span class="p">(</span>
 +    <span class="mi">0</span> <span class="o">=></span> <span class="k">array</span> <span class="p">(</span>
 +            <span class="s2">"class"</span>     <span class="o">=></span> <span class="s2">"OC_User_FTP"</span><span class="p">,</span>
 +            <span class="s2">"arguments"</span> <span class="o">=></span> <span class="k">array</span> <span class="p">(</span>
 +                              <span class="mi">0</span> <span class="o">=></span> <span class="s1">'localhost'</span>
 +                              <span class="p">),</span>
 +    <span class="p">),</span>
 +<span class="p">),</span>
 +</pre></div>
 +</div>
 +</div>
 +</div>
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/configuration/index.html
index ddc8304,0000000..1652cea
mode 100644,000000..100644
--- a/core/doc/admin/configuration/index.html
+++ b/core/doc/admin/configuration/index.html
@@@ -1,196 -1,0 +1,199 @@@
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>Configuration — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '../',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="../_static/jquery.js"></script>
 +    <script type="text/javascript" src="../_static/underscore.js"></script>
 +    <script type="text/javascript" src="../_static/doctools.js"></script>
 +    <script type="text/javascript" src="../_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
 +    <link rel="next" title="Managing Apps" href="configuration_apps.html" />
 +    <link rel="prev" title="PageKite Configuration" href="../installation/installation_others.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="../contents.html">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
 +<ul class="current">
 +<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
 +<li class="toctree-l1 current"><a class="current reference internal" href="">Configuration</a><ul>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_apps.html">Managing Apps</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_users.html">User Management</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="auth_ldap.html">LDAP Authentication</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="background_jobs.html">Background Jobs</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_3rdparty.html">Find Third-Party Libraries</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_automation.html">Automatic Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_custom_clients.html">Customizing Client Download Links</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_database.html">MySQL/Postgres/SQLite Support</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_encryption.html">Using Server-Side Encryption</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_knowledgebase.html">Disable Knowledge Base</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_language.html">Setting the Default Language</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_logging.html">Configure Logging</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_mail.html">Sending Mail Notifications</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_maintenance.html">Enable Maintenance Mode</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_preview.html">Enabling File Previews</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_reverseproxy.html">Reverse Proxy Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html">Dealing with Big File Uploads</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="custom_mount_config_gui.html">Custom Mount Configuration Web-GUI</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="custom_mount_config.html">Custom Mount Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="custom_user_backend.html">Custom User Backend Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="xsendfile.html">Serving static files via web server</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l1"><a class="reference internal" href="../apps/index.html">Apps</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../sharing_api/index.html">Sharing API</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../config/index.html">The Configuration File</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <div class="section" id="configuration">
 +<h1>Configuration<a class="headerlink" href="#configuration" title="Permalink to this headline">¶</a></h1>
 +<div class="toctree-wrapper compound">
 +<ul>
 +<li class="toctree-l1"><a class="reference internal" href="configuration_apps.html">Managing Apps</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="configuration_users.html">User Management</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="auth_ldap.html">LDAP Authentication</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="background_jobs.html">Background Jobs</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="configuration_3rdparty.html">Find Third-Party Libraries</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="configuration_automation.html">Automatic Configuration</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="configuration_custom_clients.html">Customizing Client Download Links</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="configuration_database.html">MySQL/Postgres/SQLite Support</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="configuration_encryption.html">Using Server-Side Encryption</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="configuration_knowledgebase.html">Disable Knowledge Base</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="configuration_language.html">Setting the Default Language</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="configuration_logging.html">Configure Logging</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="configuration_mail.html">Sending Mail Notifications</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="configuration_maintenance.html">Enable Maintenance Mode</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="configuration_preview.html">Enabling File Previews</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="configuration_reverseproxy.html">Reverse Proxy Configuration</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="configuring_big_file_upload.html">Dealing with Big File Uploads</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="custom_mount_config_gui.html">Custom Mount Configuration Web-GUI</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="custom_mount_config.html">Custom Mount Configuration</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="custom_user_backend.html">Custom User Backend Configuration</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="xsendfile.html">Serving static files via web server</a></li>
 +</ul>
 +</div>
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/configuration/xsendfile.html
index ec73f9f,0000000..d1bbd19
mode 100644,000000..100644
--- a/core/doc/admin/configuration/xsendfile.html
+++ b/core/doc/admin/configuration/xsendfile.html
@@@ -1,291 -1,0 +1,294 @@@
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>Serving static files via web server — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '../',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="../_static/jquery.js"></script>
 +    <script type="text/javascript" src="../_static/underscore.js"></script>
 +    <script type="text/javascript" src="../_static/doctools.js"></script>
 +    <script type="text/javascript" src="../_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
 +    <link rel="up" title="Configuration" href="index.html" />
 +    <link rel="next" title="Apps" href="../apps/index.html" />
 +    <link rel="prev" title="Custom User Backend Configuration" href="custom_user_backend.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="../contents.html">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
 +<ul class="current">
 +<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
 +<li class="toctree-l1 current"><a class="reference internal" href="index.html">Configuration</a><ul class="current">
 +<li class="toctree-l2"><a class="reference internal" href="configuration_apps.html">Managing Apps</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_users.html">User Management</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="auth_ldap.html">LDAP Authentication</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="background_jobs.html">Background Jobs</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_3rdparty.html">Find Third-Party Libraries</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_automation.html">Automatic Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_custom_clients.html">Customizing Client Download Links</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_database.html">MySQL/Postgres/SQLite Support</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_encryption.html">Using Server-Side Encryption</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_knowledgebase.html">Disable Knowledge Base</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_language.html">Setting the Default Language</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_logging.html">Configure Logging</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_mail.html">Sending Mail Notifications</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_maintenance.html">Enable Maintenance Mode</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_preview.html">Enabling File Previews</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration_reverseproxy.html">Reverse Proxy Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html">Dealing with Big File Uploads</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="custom_mount_config_gui.html">Custom Mount Configuration Web-GUI</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="custom_mount_config.html">Custom Mount Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="custom_user_backend.html">Custom User Backend Configuration</a></li>
 +<li class="toctree-l2 current"><a class="current reference internal" href="">Serving static files via web server</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="#apache2-x-sendfile">Apache2 (X-Sendfile)</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="#lighttpd-x-sendfile2">LigHTTPd (X-Sendfile2)</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="#nginx-x-accel-redirect">Nginx (X-Accel-Redirect)</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="#how-to-check-if-it-s-working">How to check if it’s working?</a></li>
 +</ul>
 +</li>
 +</ul>
 +</li>
 +<li class="toctree-l1"><a class="reference internal" href="../apps/index.html">Apps</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../sharing_api/index.html">Sharing API</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../config/index.html">The Configuration File</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <div class="section" id="serving-static-files-via-web-server">
 +<h1>Serving static files via web server<a class="headerlink" href="#serving-static-files-via-web-server" title="Permalink to this headline">¶</a></h1>
 +<p>Since ownCloud 5 it is possible to let web servers handle static file serving.
 +This should generally improve performance (web servers are optimized for this) and in some cases permits controlled
 +file serving (i.e. pause and resume downloads).</p>
 +<div class="admonition note">
 +<p class="first admonition-title">Note</p>
- <p class="last">This feature can currently only be activated for local files, i.e. files inside the <strong>data/</strong> directory</p>
++<p class="last">This feature can currently only be activated for local files, i.e. files inside the <strong>data/</strong> directory
++and local mounts. Controlled file serving <strong>does not work for generated zip files</strong>. This is due to how temporary files are created.</p>
 +</div>
- <p>and local mounts. Controlled file serving <strong>does not work for generated zip files</strong>. This is due to how temporary files are created.</p>
 +<div class="section" id="apache2-x-sendfile">
 +<h2>Apache2 (X-Sendfile)<a class="headerlink" href="#apache2-x-sendfile" title="Permalink to this headline">¶</a></h2>
 +<p>It is possible to let Apache handle static file serving via <a class="reference external" href="https://tn123.org/mod_xsendfile/">mod_xsendfile</a>.</p>
 +<div class="section" id="installation">
 +<h3>Installation<a class="headerlink" href="#installation" title="Permalink to this headline">¶</a></h3>
 +<p>On Debian and Ubuntu systems use:</p>
 +<div class="highlight-bash"><div class="highlight"><pre>apt-get install libapache2-mod-xsendfile
 +</pre></div>
 +</div>
 +</div>
 +<div class="section" id="configuration">
 +<h3>Configuration<a class="headerlink" href="#configuration" title="Permalink to this headline">¶</a></h3>
 +<p>Configuration of mod_xsendfile for ownCloud depends on its version.
 +For versions below 0.10 (Debian squeeze ships with 0.9)</p>
 +<div class="highlight-xml"><pre><Directory /var/www/owncloud>
 +    ...
 +    SetEnv MOD_X_SENDFILE_ENABLED 1
 +    XSendFile On
 +    XSendFileAllowAbove On
 +</Directory></pre>
 +</div>
 +<p>For versions >=0.10 (e.g. Ubuntu 12.10)</p>
 +<div class="highlight-xml"><pre><Directory /var/www/owncloud>
 +    ...
 +    SetEnv MOD_X_SENDFILE_ENABLED 1
 +    XSendFile On
 +    XSendFilePath /tmp/oc-noclean
 +    XSendFilePath /home/valerio
 +</Directory></pre>
 +</div>
 +<ul class="simple">
 +<li><strong>SetEnv MOD_X_SENDFILE_ENABLED</strong>: tells ownCloud scripts that they should add the X-Sendfile header when serving files</li>
 +<li><strong>XSendFile</strong>: enables web server handling of X-Sendfile headers (and therefore file serving) for the specified Directory</li>
 +<li><strong>XSendFileAllowAbove (<0.10)</strong>: enables file serving through web server on path outside the specified Directory. This is needed for PHP temporary directory where zip files are created and for configured local mounts which may reside outside data directory</li>
 +<li><strong>XSendFilePath (>=0.10)</strong>: a white list of paths that the web server is allowed to serve outside of the specified Directory. At least PHP temporary directory concatenated with <em>oc-noclean</em> must be configured. Temporary zip files will be created inside this directory when using mod_xsendfile. Other paths which correspond to local mounts should be configured here as well. For a more in-dept documentation of this directive refer to mod_xsendfile website linked a [...]
 +</ul>
 +</div>
 +</div>
 +<div class="section" id="lighttpd-x-sendfile2">
 +<h2>LigHTTPd (X-Sendfile2)<a class="headerlink" href="#lighttpd-x-sendfile2" title="Permalink to this headline">¶</a></h2>
 +<p>LigHTTPd uses similar headers to Apache2, apart from the fact that it does not handle partial downloads in the same way
 +Apache2 does. For this reason, a different method is used for LigHTTPd.</p>
 +<div class="section" id="id1">
 +<h3>Installation<a class="headerlink" href="#id1" title="Permalink to this headline">¶</a></h3>
 +<p>X-Sendfile and X-Sendfile2 are supported by default in LigHTTPd and no additional operation should be needed to install it.</p>
 +</div>
 +<div class="section" id="id2">
 +<h3>Configuration<a class="headerlink" href="#id2" title="Permalink to this headline">¶</a></h3>
 +<p>Your server configuration should include the following statements:</p>
 +<div class="highlight-python"><pre>fastcgi.server          = ( ".php" => ((
 +   ...
 +   "allow-x-send-file" => "enable",
 +   "bin-environment" => (
 +      "MOD_X_SENDFILE2_ENABLED" => "1",
 +   ),
 +)))</pre>
 +</div>
 +<ul class="simple">
 +<li><strong>allow-x-send-file</strong>: enables LigHTTPd to use X-Sendfile and X-Sendfile2 headers to serve files</li>
 +<li><strong>bin-environment</strong>: is used to parse MOD_X_SENDFILE2_ENABLED to the ownCloud backend, to make it use the X-Sendfile and X-Sendfile2 headers in it’s response</li>
 +</ul>
 +</div>
 +</div>
 +<div class="section" id="nginx-x-accel-redirect">
 +<h2>Nginx (X-Accel-Redirect)<a class="headerlink" href="#nginx-x-accel-redirect" title="Permalink to this headline">¶</a></h2>
 +<p>Nginx supports handling of static files differently from Apache. Documentation can be found in the Nginx Wiki
 +section <a class="reference external" href="http://wiki.nginx.org/XSendfile">Mod X-Sendfile</a> and section <a class="reference external" href="http://wiki.nginx.org/X-accel">X-Accell</a>.
 +The header used by Nginx is X-Accel-Redirect.</p>
 +<div class="section" id="id3">
 +<h3>Installation<a class="headerlink" href="#id3" title="Permalink to this headline">¶</a></h3>
 +<p>X-Accel-Redirect is supported by default in Nginx and no additional operation should be needed to install it.</p>
 +</div>
 +<div class="section" id="id4">
 +<h3>Configuration<a class="headerlink" href="#id4" title="Permalink to this headline">¶</a></h3>
 +<p>Configuration is similar to Apache:</p>
 +<div class="highlight-python"><pre>location ~ \.php$ {
 +    ...
 +    fastcgi_param MOD_X_ACCEL_REDIRECT_ENABLED on;
 +}
 +
 +location ~ ^/home/valerio/(owncloud/)?data {
 +    internal;
 +    root /;
 +}
 +
 +location ~ ^/tmp/oc-noclean/.+$ {
 +    internal;
 +    root /;
 +}</pre>
 +</div>
 +<ul class="simple">
 +<li><strong>fastcgi_param MOD_X_ACCEL_REDIRECT_ENABLED:</strong> tells ownCloud scripts that they should add the X-Accel-Redirect header when serving files</li>
 +<li><strong>internal location:</strong> each directory that contains local user data should correspond to an internal location. In the example uses the following directories:<ul>
 +<li><strong>/home/valerio/owncloud/data</strong>: ownCloud data directory</li>
 +<li><strong>/home/valerio/data</strong>: a local mount</li>
 +<li><strong>/tmp/oc-noclean</strong>: PHP temporary directory concatenated with <em>oc-noclean</em>. Temporary zip files will be created inside this directory when using X-Accel-Redirect</li>
 +</ul>
 +</li>
 +</ul>
 +</div>
 +</div>
 +<div class="section" id="how-to-check-if-it-s-working">
 +<h2>How to check if it’s working?<a class="headerlink" href="#how-to-check-if-it-s-working" title="Permalink to this headline">¶</a></h2>
 +<p>You are still able to download stuff via the web interface and single, local file downloads can be paused and resumed.</p>
 +</div>
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/contents.html
index 3366a1a,0000000..3c29421
mode 100644,000000..100644
--- a/core/doc/admin/contents.html
+++ b/core/doc/admin/contents.html
@@@ -1,406 -1,0 +1,438 @@@
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>ownCloud documentation contents — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="_static/jquery.js"></script>
 +    <script type="text/javascript" src="_static/underscore.js"></script>
 +    <script type="text/javascript" src="_static/doctools.js"></script>
 +    <script type="text/javascript" src="_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="index.html" />
 +    <link rel="next" title="ownCloud 6.0 Admin Documentation" href="index.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="#">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="#">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
 +<ul>
 +<li class="toctree-l1"><a class="reference internal" href="installation/index.html">Installation</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="configuration/index.html">Configuration</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="apps/index.html">Apps</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1"><a class="reference internal" href="quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="sharing_api/index.html">Sharing API</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="config/index.html">The Configuration File</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <div class="section" id="owncloud-documentation-contents">
 +<span id="contents"></span><h1>ownCloud documentation contents<a class="headerlink" href="#owncloud-documentation-contents" title="Permalink to this headline">¶</a></h1>
 +<div class="toctree-wrapper compound">
 +</div>
 +<div class="toctree-wrapper compound">
 +<ul>
 +<li class="toctree-l1"><a class="reference internal" href="installation/index.html">Installation</a><ul>
 +<li class="toctree-l2"><a class="reference internal" href="installation/installation_appliance.html">Appliances</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="installation/installation_appliance.html#software-appliances">Software Appliances</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="installation/installation_appliance.html#owncloud-on-hardware-appliances">ownCloud on Hardware Appliances</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="installation/installation_linux.html">Linux Distributions</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="installation/installation_linux.html#supported-distribution-packages">Supported Distribution Packages</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="installation/installation_macos.html">Mac OS X</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="installation/installation_windows.html">Windows 7 and Windows Server 2008</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="installation/installation_windows.html#activate-iis-with-cgi-support">Activate IIS with CGI Support</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="installation/installation_windows.html#installing-php">Installing PHP</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="installation/installation_windows.html#installing-mysql">Installing MySQL</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="installation/installation_windows.html#installing-owncloud">Installing ownCloud</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="installation/installation_windows.html#ensure-proper-http-verb-handling">Ensure Proper HTTP-Verb handling</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="installation/installation_windows.html#configuring-owncloud-php-and-iis-for-large-file-uploads">Configuring ownCloud, PHP and IIS for Large File Uploads</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="installation/installation_ucs.html">Univention Corporate Server</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="installation/installation_ucs.html#pre-configuration">Pre configuration</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="installation/installation_ucs.html#installation">Installation</a></li>
- <li class="toctree-l3"><a class="reference internal" href="installation/installation_ucs.html#postconfiguration-optional">Postconfiguration (optional)</a></li>
++<li class="toctree-l3"><a class="reference internal" href="installation/installation_ucs.html#post-configuration-optional">Post configuration (optional)</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="installation/installation_ucs.html#using-owncloud">Using ownCloud</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="installation/installation_source.html">Manual Installation</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="installation/installation_source.html#prerequisites">Prerequisites</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="installation/installation_source.html#download-extract-and-copy-owncloud-to-your-web-server">Download, extract and copy ownCloud to Your Web Server</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="installation/installation_source.html#set-the-directory-permissions">Set the Directory Permissions</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="installation/installation_source.html#web-server-configuration">Web Server Configuration</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="installation/installation_source.html#follow-the-install-wizard">Follow the Install Wizard</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="installation/installation_source.html#note">Note</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="installation/installation_others.html">PageKite Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="installation/installation_others.html#open-wrt">Open Wrt</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l1"><a class="reference internal" href="configuration/index.html">Configuration</a><ul>
 +<li class="toctree-l2"><a class="reference internal" href="configuration/configuration_apps.html">Managing Apps</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_apps.html#parameters">Parameters</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration/configuration_users.html">User Management</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_users.html#users">Users</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_users.html#user-groups">User Groups</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration/auth_ldap.html">LDAP Authentication</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="configuration/auth_ldap.html#configuration">Configuration</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="configuration/auth_ldap.html#advanced-settings">Advanced Settings</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="configuration/auth_ldap.html#expert-settings">Expert Settings</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="configuration/auth_ldap.html#testing-the-configuration">Testing the configuration</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="configuration/auth_ldap.html#owncloud-avatar-integration">ownCloud Avatar integration</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="configuration/auth_ldap.html#troubleshooting-tips-and-tricks">Troubleshooting, Tips and Tricks</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="configuration/auth_ldap.html#ssl-certificate-verification-ldaps-tls">SSL Certificate Verification (LDAPS, TLS)</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="configuration/auth_ldap.html#microsoft-active-directory">Microsoft Active Directory</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="configuration/auth_ldap.html#duplicating-server-configurations">Duplicating Server Configurations</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="configuration/auth_ldap.html#owncloud-ldap-internals">ownCloud LDAP Internals</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="configuration/auth_ldap.html#groups">Groups</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="configuration/auth_ldap.html#user-and-group-mapping">User and Group Mapping</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="configuration/auth_ldap.html#caching">Caching</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="configuration/auth_ldap.html#handling-with-backup-server">Handling with Backup Server</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration/background_jobs.html">Background Jobs</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="configuration/background_jobs.html#parameters">Parameters</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="configuration/background_jobs.html#cron-jobs">Cron-Jobs</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration/configuration_3rdparty.html">Find Third-Party Libraries</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_3rdparty.html#parameters">Parameters</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration/configuration_automation.html">Automatic Configuration</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_automation.html#parameters">Parameters</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_automation.html#sample-automatic-configurations">Sample Automatic Configurations</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration/configuration_custom_clients.html">Customizing Client Download Links</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_custom_clients.html#parameters">Parameters</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration/configuration_database.html">MySQL/Postgres/SQLite Support</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_database.html#requirements">Requirements</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_database.html#parameters">Parameters</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_database.html#trouble-shooting">Trouble Shooting</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration/configuration_encryption.html">Using Server-Side Encryption</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_encryption.html#enable-file-recovery-feature">Enable File Recovery Feature</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_encryption.html#recover-user-files">Recover User Files</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_encryption.html#ldap-and-other-external-user-back-ends">LDAP and other external user back-ends</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration/configuration_knowledgebase.html">Disable Knowledge Base</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_knowledgebase.html#parameters">Parameters</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration/configuration_language.html">Setting the Default Language</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_language.html#parameters">Parameters</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration/configuration_logging.html">Configure Logging</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_logging.html#parameters">Parameters</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration/configuration_mail.html">Sending Mail Notifications</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_mail.html#requirements">Requirements</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_mail.html#parameters">Parameters</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_mail.html#send-a-test-email">Send a Test Email</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_mail.html#trouble-shooting">Trouble shooting</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration/configuration_maintenance.html">Enable Maintenance Mode</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_maintenance.html#parameters">Parameters</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration/configuration_preview.html">Enabling File Previews</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_preview.html#soft-dependencies">Soft dependencies:</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_preview.html#parameters">Parameters</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration/configuration_reverseproxy.html">Reverse Proxy Configuration</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_reverseproxy.html#parameters">Parameters</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_reverseproxy.html#example">Example</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration/configuring_big_file_upload.html">Dealing with Big File Uploads</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="configuration/configuring_big_file_upload.html#not-outnumberable-upload-limits">Not outnumberable upload limits:</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="configuration/configuring_big_file_upload.html#other-recommendable-preconditions">Other recommendable preconditions:</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="configuration/configuring_big_file_upload.html#enabling-uploading-big-files">Enabling uploading big files</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration/custom_mount_config_gui.html">Custom Mount Configuration Web-GUI</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="configuration/custom_mount_config_gui.html#id1">Dropbox</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="configuration/custom_mount_config_gui.html#id2">Google Drive</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration/custom_mount_config.html">Custom Mount Configuration</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="configuration/custom_mount_config.html#example">Example</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="configuration/custom_mount_config.html#backends">Backends</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration/custom_user_backend.html">Custom User Backend Configuration</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="configuration/custom_user_backend.html#imap">IMAP</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="configuration/custom_user_backend.html#smb">SMB</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="configuration/xsendfile.html">Serving static files via web server</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="configuration/xsendfile.html#apache2-x-sendfile">Apache2 (X-Sendfile)</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="configuration/xsendfile.html#lighttpd-x-sendfile2">LigHTTPd (X-Sendfile2)</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="configuration/xsendfile.html#nginx-x-accel-redirect">Nginx (X-Accel-Redirect)</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="configuration/xsendfile.html#how-to-check-if-it-s-working">How to check if it’s working?</a></li>
 +</ul>
 +</li>
 +</ul>
 +</li>
 +<li class="toctree-l1"><a class="reference internal" href="apps/index.html">Apps</a><ul>
 +<li class="toctree-l2"><a class="reference internal" href="apps/activity/index.html">Activity</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="apps/activity/index.html#configuration">Configuration</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="apps/activity/index.html#utilization">Utilization</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="apps/activity/index.html#rss-feed">RSS Feed</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="apps/admin_dependencies_chk/index.html">Finding Deployment Dependencies</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="apps/admin_dependencies_chk/index.html#configuration">Configuration</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="apps/admin_dependencies_chk/index.html#utilization">Utilization</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="apps/files_antivirus/index.html">File Antivirus Engine</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="apps/files_antivirus/index.html#configuration">Configuration</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="apps/files_encryption/index.html">Encryption</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="apps/files_encryption/index.html#what-gets-encrypted">What gets encrypted?</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="apps/files_encryption/index.html#decrypting-the-data">Decrypting the data</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="apps/files_encryption/index.html#configuration">Configuration</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="apps/files_encryption/index.html#file-systems">File Systems</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="apps/files_external/index.html">External storage support</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="apps/files_external/index.html#supported-mounts">Supported mounts</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="apps/files_external/index.html#configuration">Configuration</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="apps/files_sharing/index.html">Sharing</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="apps/files_sharing/index.html#configuration">Configuration</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="apps/files_sharing/index.html#utilization">Utilization</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="apps/files_sharing/index.html#retrieving-shared-data">Retrieving shared data</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="apps/files_trashbin/index.html">Deleted Files</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="apps/files_trashbin/index.html#expiry-of-deleted-files">Expiry of deleted files</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="apps/files_trashbin/index.html#configuration-and-storage">Configuration and storage</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="apps/files_trashbin/index.html#utilization">Utilization</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="apps/files_versions/index.html">Versions</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="apps/files_versions/index.html#expiry-of-versions">Expiry of versions</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="apps/files_versions/index.html#space-limitations">Space limitations</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="apps/files_versions/index.html#configuration-and-storage">Configuration and storage</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="apps/files_versions/index.html#utilization">Utilization</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="apps/firstrunwizard/index.html">First Run Wizard</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="apps/firstrunwizard/index.html#configuration">Configuration</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="apps/firstrunwizard/index.html#usage">Usage</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="apps/firstrunwizard/index.html#links">Links</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="apps/user_ldap/index.html">LDAP user and group backend</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="apps/user_ldap/index.html#configuration">Configuration</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="apps/viewers/index.html">File Viewers</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="apps/viewers/index.html#configuration">Configuration</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="apps/viewers/index.html#utilization">Utilization</a></li>
 +</ul>
 +</li>
 +</ul>
 +</li>
 +<li class="toctree-l1"><a class="reference internal" href="maintenance/index.html">Maintenance</a><ul>
 +<li class="toctree-l2"><a class="reference internal" href="maintenance/backup.html">Backing up ownCloud</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="maintenance/backup.html#backup-folders">Backup Folders</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="maintenance/backup.html#backup-database">Backup Database</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="maintenance/update.html">Updating ownCloud</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="maintenance/update.html#update">Update</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="maintenance/update.html#upgrade">Upgrade</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="maintenance/restore.html">Restoring ownCloud</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="maintenance/restore.html#restore-folders">Restore Folders</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="maintenance/restore.html#restore-database">Restore Database</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="maintenance/migrating.html">Migrating ownCloud Installations</a></li>
 +</ul>
 +</li>
++<li class="toctree-l1"><a class="reference internal" href="cron/index.html">Driving Events with Cron</a><ul>
++<li class="toctree-l2"><a class="reference internal" href="cron/index.html#introduction">Introduction</a></li>
++<li class="toctree-l2"><a class="reference internal" href="cron/index.html#usage">Usage</a></li>
++</ul>
++</li>
++<li class="toctree-l1"><a class="reference internal" href="quota/index.html">Quota Calculation</a><ul>
++<li class="toctree-l2"><a class="reference internal" href="quota/index.html#introduction">Introduction</a></li>
++<li class="toctree-l2"><a class="reference internal" href="quota/index.html#checking-available-space">Checking available space</a></li>
++<li class="toctree-l2"><a class="reference internal" href="quota/index.html#sharing">Sharing</a><ul>
++<li class="toctree-l3"><a class="reference internal" href="quota/index.html#shared-files">Shared Files</a></li>
++<li class="toctree-l3"><a class="reference internal" href="quota/index.html#shared-directories">Shared Directories</a></li>
++<li class="toctree-l3"><a class="reference internal" href="quota/index.html#resharing">Resharing</a></li>
++<li class="toctree-l3"><a class="reference internal" href="quota/index.html#public-sharing-with-upload-permission">Public sharing with upload permission</a></li>
++<li class="toctree-l3"><a class="reference internal" href="quota/index.html#metadata-and-cache">Metadata and cache</a></li>
++<li class="toctree-l3"><a class="reference internal" href="quota/index.html#deleted-files">Deleted Files</a></li>
++<li class="toctree-l3"><a class="reference internal" href="quota/index.html#version-control">Version Control</a></li>
++<li class="toctree-l3"><a class="reference internal" href="quota/index.html#encryption">Encryption</a></li>
++<li class="toctree-l3"><a class="reference internal" href="quota/index.html#external-storage">External Storage</a></li>
++</ul>
++</li>
++</ul>
++</li>
++<li class="toctree-l1"><a class="reference internal" href="sharing_api/index.html">Sharing API</a><ul>
++<li class="toctree-l2"><a class="reference internal" href="sharing_api/index.html#introduction">Introduction</a><ul>
++<li class="toctree-l3"><a class="reference internal" href="sharing_api/index.html#permissions">Permissions</a></li>
++</ul>
++</li>
++</ul>
++</li>
 +<li class="toctree-l1"><a class="reference internal" href="config/index.html">The Configuration File</a><ul>
 +</ul>
 +</li>
 +<li class="toctree-l1"><a class="reference internal" href="issues/index.html">Issues</a></li>
 +</ul>
 +</div>
 +<div class="section" id="indices-and-tables">
 +<h2>Indices and tables<a class="headerlink" href="#indices-and-tables" title="Permalink to this headline">¶</a></h2>
 +<ul class="simple">
 +<li><a class="reference internal" href="genindex.html"><em>Index</em></a></li>
 +</ul>
 +</div>
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/cron/index.html
index ec0efe8,0000000..161ebcf
mode 100644,000000..100644
--- a/core/doc/admin/cron/index.html
+++ b/core/doc/admin/cron/index.html
@@@ -1,174 -1,0 +1,183 @@@
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>Driving Events with Cron — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '../',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="../_static/jquery.js"></script>
 +    <script type="text/javascript" src="../_static/underscore.js"></script>
 +    <script type="text/javascript" src="../_static/doctools.js"></script>
 +    <script type="text/javascript" src="../_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
++    <link rel="next" title="Quota Calculation" href="../quota/index.html" />
++    <link rel="prev" title="Migrating ownCloud Installations" href="../maintenance/migrating.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="../contents.html">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
- <ul>
++<ul class="current">
 +<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../apps/index.html">Apps</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1 current"><a class="current reference internal" href="">Driving Events with Cron</a><ul>
++<li class="toctree-l2"><a class="reference internal" href="#introduction">Introduction</a></li>
++<li class="toctree-l2"><a class="reference internal" href="#usage">Usage</a></li>
++</ul>
++</li>
++<li class="toctree-l1"><a class="reference internal" href="../quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../sharing_api/index.html">Sharing API</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../config/index.html">The Configuration File</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <div class="section" id="driving-events-with-cron">
 +<h1>Driving Events with Cron<a class="headerlink" href="#driving-events-with-cron" title="Permalink to this headline">¶</a></h1>
 +<div class="section" id="introduction">
 +<h2>Introduction<a class="headerlink" href="#introduction" title="Permalink to this headline">¶</a></h2>
 +<p>ownCloud is written in PHP, and because PHP is a request driven language – in
 +other words it runs only when a client takes an action and calls php, and then
 +it executes and ends – it does not have a built in CRON process. Instead,
 +ownCloud provides <tt class="docutils literal"><span class="pre">cron.php</span></tt>, which is called by the server’s CRON daemon.
 +<tt class="docutils literal"><span class="pre">cron.php</span></tt> is an ownCloud internal process that runs various background jobs
 +on demand.  It is called by the server cron, and can be set by the
 +administrator.</p>
 +<p>ownCloud plug-in applications register actions with <tt class="docutils literal"><span class="pre">cron.php</span></tt> automatically to
 +take care of typical housekeeping operations, such as garbage collecting of
 +temporary files or checking for newly updated files using <tt class="docutils literal"><span class="pre">filescan()</span></tt> for
 +externally mounted file systems.</p>
 +</div>
 +<div class="section" id="usage">
 +<h2>Usage<a class="headerlink" href="#usage" title="Permalink to this headline">¶</a></h2>
 +<p>The interval at which this script is executed, and thus the ownCloud registered
 +actions, can depend on the size of the installation and the load of the system.
 +Recommended intervals are 15 or 30 minutes.</p>
 +<p>Cron.php needs to be called by the system’s cron daemon and run as the same
 +user the web server runs as.</p>
 +<p>As an example, on an ordinary Linux distribution, place the following in the
- webserver’s user’s crontab:</p>
++web server’s user’s crontab:</p>
 +<div class="highlight-python"><pre>*/15 * * * * /usr/bin/php -f /srv/http/owncloud/cron.php /dev/null 2>&1</pre>
 +</div>
 +<p>This will run <tt class="docutils literal"><span class="pre">cron.php</span></tt> every 15 minutes and suppress any warnings or output
 +which may be generated.</p>
 +</div>
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/genindex.html
index ea567fb,0000000..f63393c
mode 100644,000000..100644
--- a/core/doc/admin/genindex.html
+++ b/core/doc/admin/genindex.html
@@@ -1,151 -1,0 +1,154 @@@
 +
 +
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>Index — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="_static/jquery.js"></script>
 +    <script type="text/javascript" src="_static/underscore.js"></script>
 +    <script type="text/javascript" src="_static/doctools.js"></script>
 +    <script type="text/javascript" src="_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="index.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="contents.html">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
 +<ul>
 +<li class="toctree-l1"><a class="reference internal" href="installation/index.html">Installation</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="configuration/index.html">Configuration</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="apps/index.html">Apps</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1"><a class="reference internal" href="quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="sharing_api/index.html">Sharing API</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="config/index.html">The Configuration File</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +
 +<h1 id="index">Index</h1>
 +
 +<div class="genindex-jumpbox">
 + 
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/index.html
index ef774bc,7785f2c..17031e4
--- a/core/doc/admin/index.html
+++ b/core/doc/admin/index.html
@@@ -1,248 -1,2 +1,253 @@@
 -Here goes the admin documentation.
 -In the meantime go to <a href="http://owncloud.org/support/" target="_blank">ownCloud.org/support</a>
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>ownCloud 6.0 Admin Documentation — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="_static/jquery.js"></script>
 +    <script type="text/javascript" src="_static/underscore.js"></script>
 +    <script type="text/javascript" src="_static/doctools.js"></script>
 +    <script type="text/javascript" src="_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="#" />
 +    <link rel="next" title="Installation" href="installation/index.html" />
 +    <link rel="prev" title="ownCloud documentation contents" href="contents.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="contents.html">Overview</a></li>
 +									</ul>
 +                  <ul class="current">
 +<li class="toctree-l1 current"><a class="current reference internal" href="">ownCloud 6.0 Admin Documentation</a><ul>
 +<li class="toctree-l2"><a class="reference internal" href="#introduction">Introduction</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="#target-audience">Target audience</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="#structure-of-this-document">Structure of this document</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="#installation">Installation</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="#configuration">Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="#apps">Apps</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="#maintenance">Maintenance</a></li>
 +</ul>
 +</li>
 +</ul>
 +<ul>
 +<li class="toctree-l1"><a class="reference internal" href="installation/index.html">Installation</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="configuration/index.html">Configuration</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="apps/index.html">Apps</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1"><a class="reference internal" href="quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="sharing_api/index.html">Sharing API</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="config/index.html">The Configuration File</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <div class="section" id="owncloud-version-admin-documentation">
 +<h1>ownCloud 6.0 Admin Documentation<a class="headerlink" href="#owncloud-version-admin-documentation" title="Permalink to this headline">¶</a></h1>
 +<div class="section" id="introduction">
 +<h2>Introduction<a class="headerlink" href="#introduction" title="Permalink to this headline">¶</a></h2>
 +<p>This is the administrators manual for ownCloud, a flexible, open source file
 +sync and share solution. It comprises of the ownCloud server, as well as client
 +applications for Microsoft Windows, Mac OS X and Linux (Desktop Client) and
 +mobile clients for the Android and Apple iOS operating system.</p>
 +<div class="section" id="target-audience">
 +<h3>Target audience<a class="headerlink" href="#target-audience" title="Permalink to this headline">¶</a></h3>
 +<p>This guide is targeted towards people who want to install, administer and
 +optimize ownCloud Server. If you want to learn how to use the Web UI, or how to
 +install clients on the server, please refer to the <a class="reference external" href="http://doc.owncloud.com/">User Manual</a> or the <a class="reference external" href="http://doc.owncloud.com/">Desktop
 +Client Manual</a> respectively.</p>
 +</div>
 +<div class="section" id="structure-of-this-document">
 +<h3>Structure of this document<a class="headerlink" href="#structure-of-this-document" title="Permalink to this headline">¶</a></h3>
 +<p>The next chapters describes how to set up ownCloud Server on different platforms
 +and operating systems, as well as how to update existing installations.</p>
 +<p>Further chapters will then detail on integrating ownCloud into your existing
 +environment, e.g. how to setup LDAP or how to mount your storage.</p>
 +</div>
 +</div>
 +<div class="section" id="installation">
 +<h2>Installation<a class="headerlink" href="#installation" title="Permalink to this headline">¶</a></h2>
 +<p>This chapter will introduce you to the installation of ownCloud in different scenarios.</p>
 +<p>If you want to just try ownCloud in a virtual machine without any configuration, check the section
 +<a class="reference internal" href="installation/installation_appliance.html"><em>Appliances</em></a>, where you will find ready-to-use images.</p>
 +<ul class="simple">
 +<li><a class="reference internal" href="installation/installation_linux.html"><em>Linux Distributions</em></a> (recommended)</li>
 +<li><a class="reference internal" href="installation/installation_windows.html"><em>Windows 7 and Windows Server 2008</em></a></li>
 +<li><a class="reference internal" href="installation/installation_source.html"><em>Manual Installation</em></a></li>
 +<li><a class="reference internal" href="installation/installation_others.html"><em>PageKite Configuration</em></a></li>
 +<li><a class="reference internal" href="installation/installation_ucs.html"><em>Univention Corporate Server</em></a></li>
 +<li><a class="reference internal" href="installation/installation_macos.html"><em>Mac OS X</em></a> (not supported)</li>
 +<li><a class="reference internal" href="installation/installation_appliance.html"><em>Appliances</em></a></li>
 +</ul>
 +</div>
 +<div class="section" id="configuration">
 +<h2>Configuration<a class="headerlink" href="#configuration" title="Permalink to this headline">¶</a></h2>
 +<p>This chapter covers ownCloud and web server configuration.</p>
 +<ul class="simple">
 +<li><a class="reference internal" href="configuration/configuration_apps.html"><em>Managing Apps</em></a></li>
 +<li><a class="reference internal" href="configuration/configuration_users.html"><em>User Management</em></a></li>
 +<li><a class="reference internal" href="configuration/configuration_database.html"><em>MySQL/Postgres/SQLite Support</em></a></li>
 +<li><a class="reference internal" href="configuration/auth_ldap.html"><em>LDAP Authentication</em></a></li>
++<li><a class="reference internal" href="cron/index.html"><em>Driving Events with Cron</em></a></li>
++<li><a class="reference internal" href="quota/index.html"><em>Quota Calculation</em></a></li>
 +<li><a class="reference internal" href="configuration/custom_mount_config_gui.html"><em>Custom Mount Configuration Web-GUI</em></a></li>
 +<li><a class="reference internal" href="configuration/custom_mount_config.html"><em>Custom Mount Configuration</em></a></li>
 +<li><a class="reference internal" href="configuration/background_jobs.html"><em>Background Jobs</em></a></li>
 +<li><a class="reference internal" href="configuration/configuration_mail.html"><em>Sending Mail Notifications</em></a></li>
 +<li><a class="reference internal" href="configuration/configuration_automation.html"><em>Automatic Configuration</em></a></li>
 +<li><a class="reference internal" href="configuration/configuration_encryption.html"><em>Using Server-Side Encryption</em></a></li>
 +<li><a class="reference internal" href="configuration/configuring_big_file_upload.html"><em>Dealing with Big File Uploads</em></a></li>
 +<li><a class="reference internal" href="configuration/configuration_reverseproxy.html"><em>Reverse Proxy Configuration</em></a></li>
 +<li><a class="reference internal" href="configuration/xsendfile.html"><em>Serving static files via web server</em></a></li>
 +<li><a class="reference internal" href="configuration/configuration_3rdparty.html"><em>Find Third-Party Libraries</em></a></li>
 +<li><a class="reference internal" href="configuration/custom_user_backend.html"><em>Custom User Backend Configuration</em></a></li>
 +<li><a class="reference internal" href="configuration/configuration_custom_clients.html"><em>Customizing Client Download Links</em></a></li>
 +<li><a class="reference internal" href="configuration/configuration_maintenance.html"><em>Enable Maintenance Mode</em></a></li>
 +<li><a class="reference internal" href="configuration/configuration_knowledgebase.html"><em>Disable Knowledge Base</em></a></li>
 +<li><a class="reference internal" href="configuration/configuration_logging.html"><em>Configure Logging</em></a></li>
 +<li><a class="reference internal" href="configuration/configuration_language.html"><em>Setting the Default Language</em></a></li>
 +</ul>
 +<p>Finally, the chapter <a class="reference internal" href="config/index.html"><em>The Configuration File</em></a> details on the switches
 +in the <tt class="docutils literal"><span class="pre">config.php</span></tt> file.</p>
 +</div>
 +<div class="section" id="apps">
 +<h2>Apps<a class="headerlink" href="#apps" title="Permalink to this headline">¶</a></h2>
 +<p>This chapter covers individual ownCloud apps.</p>
 +<ul class="simple">
 +<li><a class="reference internal" href="apps/activity/index.html"><em>Activity</em></a></li>
 +<li><a class="reference internal" href="apps/admin_dependencies_chk/index.html"><em>Finding Deployment Dependencies</em></a></li>
 +<li><a class="reference internal" href="apps/files_antivirus/index.html"><em>File Antivirus Engine</em></a></li>
 +<li><a class="reference internal" href="apps/files_encryption/index.html"><em>Encryption</em></a></li>
 +<li><a class="reference internal" href="apps/files_external/index.html"><em>External storage support</em></a></li>
 +<li><a class="reference internal" href="apps/files_sharing/index.html"><em>Sharing</em></a></li>
 +<li><a class="reference internal" href="apps/files_trashbin/index.html"><em>Deleted Files</em></a></li>
 +<li><a class="reference internal" href="apps/files_versions/index.html"><em>Versions</em></a></li>
 +<li><a class="reference internal" href="apps/firstrunwizard/index.html"><em>First Run Wizard</em></a></li>
 +<li><a class="reference internal" href="apps/user_ldap/index.html"><em>LDAP user and group backend</em></a></li>
 +<li><a class="reference internal" href="apps/viewers/index.html"><em>File Viewers</em></a></li>
 +</ul>
 +</div>
 +<div class="section" id="maintenance">
 +<h2>Maintenance<a class="headerlink" href="#maintenance" title="Permalink to this headline">¶</a></h2>
 +<p>This chapter covers maintenance tasks such as updating or migrating to a new version.</p>
 +<ul class="simple">
 +<li><a class="reference internal" href="maintenance/migrating.html"><em>Migrating ownCloud Installations</em></a></li>
 +<li><a class="reference internal" href="maintenance/update.html"><em>Updating ownCloud</em></a></li>
 +</ul>
 +</div>
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/installation/index.html
index 7d8ff3c,0000000..5b1bf0e
mode 100644,000000..100644
--- a/core/doc/admin/installation/index.html
+++ b/core/doc/admin/installation/index.html
@@@ -1,170 -1,0 +1,173 @@@
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>Installation — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '../',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="../_static/jquery.js"></script>
 +    <script type="text/javascript" src="../_static/underscore.js"></script>
 +    <script type="text/javascript" src="../_static/doctools.js"></script>
 +    <script type="text/javascript" src="../_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
 +    <link rel="next" title="Appliances" href="installation_appliance.html" />
 +    <link rel="prev" title="ownCloud 6.0 Admin Documentation" href="../index.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="../contents.html">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
 +<ul class="current">
 +<li class="toctree-l1 current"><a class="current reference internal" href="">Installation</a><ul>
 +<li class="toctree-l2"><a class="reference internal" href="installation_appliance.html">Appliances</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="installation_linux.html">Linux Distributions</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="installation_macos.html">Mac OS X</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="installation_windows.html">Windows 7 and Windows Server 2008</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="installation_ucs.html">Univention Corporate Server</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="installation_source.html">Manual Installation</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="installation_others.html">PageKite Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="installation_others.html#open-wrt">Open Wrt</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../apps/index.html">Apps</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../sharing_api/index.html">Sharing API</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../config/index.html">The Configuration File</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <div class="section" id="installation">
 +<h1>Installation<a class="headerlink" href="#installation" title="Permalink to this headline">¶</a></h1>
 +<div class="toctree-wrapper compound">
 +<ul>
 +<li class="toctree-l1"><a class="reference internal" href="installation_appliance.html">Appliances</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="installation_linux.html">Linux Distributions</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="installation_macos.html">Mac OS X</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="installation_windows.html">Windows 7 and Windows Server 2008</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="installation_ucs.html">Univention Corporate Server</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="installation_source.html">Manual Installation</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="installation_others.html">PageKite Configuration</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="installation_others.html#open-wrt">Open Wrt</a></li>
 +</ul>
 +</div>
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/installation/installation_appliance.html
index a6207a8,0000000..00aa87a
mode 100644,000000..100644
--- a/core/doc/admin/installation/installation_appliance.html
+++ b/core/doc/admin/installation/installation_appliance.html
@@@ -1,187 -1,0 +1,190 @@@
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>Appliances — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '../',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="../_static/jquery.js"></script>
 +    <script type="text/javascript" src="../_static/underscore.js"></script>
 +    <script type="text/javascript" src="../_static/doctools.js"></script>
 +    <script type="text/javascript" src="../_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
 +    <link rel="up" title="Installation" href="index.html" />
 +    <link rel="next" title="Linux Distributions" href="installation_linux.html" />
 +    <link rel="prev" title="Installation" href="index.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="../contents.html">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
 +<ul class="current">
 +<li class="toctree-l1 current"><a class="reference internal" href="index.html">Installation</a><ul class="current">
 +<li class="toctree-l2 current"><a class="current reference internal" href="">Appliances</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="#software-appliances">Software Appliances</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="#owncloud-on-hardware-appliances">ownCloud on Hardware Appliances</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="installation_linux.html">Linux Distributions</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="installation_macos.html">Mac OS X</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="installation_windows.html">Windows 7 and Windows Server 2008</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="installation_ucs.html">Univention Corporate Server</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="installation_source.html">Manual Installation</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="installation_others.html">PageKite Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="installation_others.html#open-wrt">Open Wrt</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../apps/index.html">Apps</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../sharing_api/index.html">Sharing API</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../config/index.html">The Configuration File</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <div class="section" id="appliances">
 +<h1>Appliances<a class="headerlink" href="#appliances" title="Permalink to this headline">¶</a></h1>
 +<p>If you are looking for virtual machine images, check the Software Appliances
 +section.  The Hardware Appliances section is of interest for people seeking to
 +run ownCloud on appliance hardware (i.e. NAS filers, routers, etc.).</p>
 +<div class="section" id="software-appliances">
 +<h2>Software Appliances<a class="headerlink" href="#software-appliances" title="Permalink to this headline">¶</a></h2>
 +<p>There are number of pre-made virtual machine-based appliances:</p>
 +<ul class="simple">
 +<li><a class="reference external" href="http://susestudio.com/a/TadMax/owncloud-in-a-box">SUSE Studio, ownCloud on openSuSE</a>, runnable directly from an USB stick.</li>
 +<li><a class="reference external" href="http://jujucharms.com/charms/precise/owncloud">Ubuntu charm, ownCloud</a></li>
 +</ul>
 +</div>
 +<div class="section" id="owncloud-on-hardware-appliances">
 +<h2>ownCloud on Hardware Appliances<a class="headerlink" href="#owncloud-on-hardware-appliances" title="Permalink to this headline">¶</a></h2>
 +<p>These are tutorials provided by the user communities of the respective appliances:</p>
 +<ul class="simple">
 +<li><a class="reference external" href="http://wiki.qnap.com/wiki/Category:OwnCloud">QNAP Guide</a> for QNAP NAS appliances</li>
 +<li><a class="reference external" href="http://wiki.openwrt.org/doc/howto/owncloud">OpenWrt Guide</a> for the popular embedded distribution for routers and NAS devices.</li>
 +<li><a class="reference external" href="http://www.cphub.net/index.php?id=40&pid=213">Synology Package</a> for Synology NAS products</li>
 +</ul>
 +<div class="admonition-todo admonition" id="index-0">
 +<p class="first admonition-title">Todo</p>
 +<p class="last">Tutorials for running ownCloud on Dreamplug.</p>
 +</div>
 +</div>
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/installation/installation_linux.html
index d3bad13,0000000..2a34446
mode 100644,000000..100644
--- a/core/doc/admin/installation/installation_linux.html
+++ b/core/doc/admin/installation/installation_linux.html
@@@ -1,174 -1,0 +1,177 @@@
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>Linux Distributions — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '../',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="../_static/jquery.js"></script>
 +    <script type="text/javascript" src="../_static/underscore.js"></script>
 +    <script type="text/javascript" src="../_static/doctools.js"></script>
 +    <script type="text/javascript" src="../_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
 +    <link rel="up" title="Installation" href="index.html" />
 +    <link rel="next" title="Mac OS X" href="installation_macos.html" />
 +    <link rel="prev" title="Appliances" href="installation_appliance.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="../contents.html">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
 +<ul class="current">
 +<li class="toctree-l1 current"><a class="reference internal" href="index.html">Installation</a><ul class="current">
 +<li class="toctree-l2"><a class="reference internal" href="installation_appliance.html">Appliances</a></li>
 +<li class="toctree-l2 current"><a class="current reference internal" href="">Linux Distributions</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="#supported-distribution-packages">Supported Distribution Packages</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="installation_macos.html">Mac OS X</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="installation_windows.html">Windows 7 and Windows Server 2008</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="installation_ucs.html">Univention Corporate Server</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="installation_source.html">Manual Installation</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="installation_others.html">PageKite Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="installation_others.html#open-wrt">Open Wrt</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../apps/index.html">Apps</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../sharing_api/index.html">Sharing API</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../config/index.html">The Configuration File</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <div class="section" id="linux-distributions">
 +<h1>Linux Distributions<a class="headerlink" href="#linux-distributions" title="Permalink to this headline">¶</a></h1>
 +<div class="section" id="supported-distribution-packages">
 +<h2>Supported Distribution Packages<a class="headerlink" href="#supported-distribution-packages" title="Permalink to this headline">¶</a></h2>
 +<p>Ready-to-use packages are available at <a class="reference external" href="http://software.opensuse.org/download.html?project=isv:ownCloud:community&package=owncloud">openSUSE Build Service</a> for a variety of Linux distributions.</p>
 +<p>If your distribution is not listed please follow <a class="reference internal" href="installation_source.html"><em>Manual Installation</em></a>.</p>
 +<div class="section" id="additional-installation-guides-and-notes">
 +<h3>Additional installation guides and notes<a class="headerlink" href="#additional-installation-guides-and-notes" title="Permalink to this headline">¶</a></h3>
 +<p><strong>Fedora:</strong> Make sure <a class="reference external" href="https://fedoraproject.org/wiki/SELinux_FAQ#How_do_I_enable_or_disable_SELinux_.3F">SELinux is disabled</a>
 +or else the installation process might fail.</p>
 +<p><strong>Archlinux:</strong> The are two packages for ownCloud: <a class="reference external" href="https://www.archlinux.org/packages/community/any/owncloud/">stable version</a> in the official community repository and <a class="reference external" href="http://aur.archlinux.org/packages.php?ID=38767">development version</a> in AUR.</p>
 +<p><strong>PCLinuxOS:</strong> Follow the Tutorial <a class="reference external" href="http://pclinuxoshelp.com/index.php/Owncloud,_installation_and_setup">ownCloud, installation and setup</a> on the PCLinuxOS web site.</p>
 +</div>
 +</div>
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/installation/installation_macos.html
index 8d6de74,0000000..e65f552
mode 100644,000000..100644
--- a/core/doc/admin/installation/installation_macos.html
+++ b/core/doc/admin/installation/installation_macos.html
@@@ -1,164 -1,0 +1,167 @@@
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>Mac OS X — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '../',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="../_static/jquery.js"></script>
 +    <script type="text/javascript" src="../_static/underscore.js"></script>
 +    <script type="text/javascript" src="../_static/doctools.js"></script>
 +    <script type="text/javascript" src="../_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
 +    <link rel="up" title="Installation" href="index.html" />
 +    <link rel="next" title="Windows 7 and Windows Server 2008" href="installation_windows.html" />
 +    <link rel="prev" title="Linux Distributions" href="installation_linux.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="../contents.html">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
 +<ul class="current">
 +<li class="toctree-l1 current"><a class="reference internal" href="index.html">Installation</a><ul class="current">
 +<li class="toctree-l2"><a class="reference internal" href="installation_appliance.html">Appliances</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="installation_linux.html">Linux Distributions</a></li>
 +<li class="toctree-l2 current"><a class="current reference internal" href="">Mac OS X</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="installation_windows.html">Windows 7 and Windows Server 2008</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="installation_ucs.html">Univention Corporate Server</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="installation_source.html">Manual Installation</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="installation_others.html">PageKite Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="installation_others.html#open-wrt">Open Wrt</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../apps/index.html">Apps</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../sharing_api/index.html">Sharing API</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../config/index.html">The Configuration File</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <div class="section" id="mac-os-x">
 +<h1>Mac OS X<a class="headerlink" href="#mac-os-x" title="Permalink to this headline">¶</a></h1>
 +<div class="admonition note">
 +<p class="first admonition-title">Note</p>
 +<p class="last">Due to an <a class="reference external" href="https://github.com/owncloud/core/issues/2377">issue</a> with Mac OS Unicode support, installing ownCloud Server 6.0 on
 +Mac OS is currently not supported.</p>
 +</div>
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/installation/installation_others.html
index c832dc7,0000000..86687f2
mode 100644,000000..100644
--- a/core/doc/admin/installation/installation_others.html
+++ b/core/doc/admin/installation/installation_others.html
@@@ -1,165 -1,0 +1,168 @@@
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>PageKite Configuration — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '../',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="../_static/jquery.js"></script>
 +    <script type="text/javascript" src="../_static/underscore.js"></script>
 +    <script type="text/javascript" src="../_static/doctools.js"></script>
 +    <script type="text/javascript" src="../_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
 +    <link rel="up" title="Installation" href="index.html" />
 +    <link rel="next" title="Configuration" href="../configuration/index.html" />
 +    <link rel="prev" title="Manual Installation" href="installation_source.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="../contents.html">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
 +<ul class="current">
 +<li class="toctree-l1 current"><a class="reference internal" href="index.html">Installation</a><ul class="current">
 +<li class="toctree-l2"><a class="reference internal" href="installation_appliance.html">Appliances</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="installation_linux.html">Linux Distributions</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="installation_macos.html">Mac OS X</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="installation_windows.html">Windows 7 and Windows Server 2008</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="installation_ucs.html">Univention Corporate Server</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="installation_source.html">Manual Installation</a></li>
 +<li class="toctree-l2 current"><a class="current reference internal" href="">PageKite Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="#open-wrt">Open Wrt</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../apps/index.html">Apps</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../sharing_api/index.html">Sharing API</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../config/index.html">The Configuration File</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <div class="section" id="pagekite-configuration">
 +<h1>PageKite Configuration<a class="headerlink" href="#pagekite-configuration" title="Permalink to this headline">¶</a></h1>
 +<p>You can use this <a class="reference external" href="https://pagekite.net/wiki/Howto/GNULinux/OwnCloud/">PageKite how to</a> to make your local ownCloud accessible from the
 +internet using PageKite.</p>
 +</div>
 +<div class="section" id="open-wrt">
 +<h1>Open Wrt<a class="headerlink" href="#open-wrt" title="Permalink to this headline">¶</a></h1>
 +<p>Here you can find a <a class="reference external" href="http://wiki.openwrt.org/doc/howto/owncloud">tutorial for open Wrt</a></p>
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/installation/installation_source.html
index 97bbc7d,0000000..24f09ec
mode 100644,000000..100644
--- a/core/doc/admin/installation/installation_source.html
+++ b/core/doc/admin/installation/installation_source.html
@@@ -1,829 -1,0 +1,832 @@@
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>Manual Installation — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '../',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="../_static/jquery.js"></script>
 +    <script type="text/javascript" src="../_static/underscore.js"></script>
 +    <script type="text/javascript" src="../_static/doctools.js"></script>
 +    <script type="text/javascript" src="../_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
 +    <link rel="up" title="Installation" href="index.html" />
 +    <link rel="next" title="PageKite Configuration" href="installation_others.html" />
 +    <link rel="prev" title="Univention Corporate Server" href="installation_ucs.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="../contents.html">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
 +<ul class="current">
 +<li class="toctree-l1 current"><a class="reference internal" href="index.html">Installation</a><ul class="current">
 +<li class="toctree-l2"><a class="reference internal" href="installation_appliance.html">Appliances</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="installation_linux.html">Linux Distributions</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="installation_macos.html">Mac OS X</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="installation_windows.html">Windows 7 and Windows Server 2008</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="installation_ucs.html">Univention Corporate Server</a></li>
 +<li class="toctree-l2 current"><a class="current reference internal" href="">Manual Installation</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="#prerequisites">Prerequisites</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="#download-extract-and-copy-owncloud-to-your-web-server">Download, extract and copy ownCloud to Your Web Server</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="#set-the-directory-permissions">Set the Directory Permissions</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="#web-server-configuration">Web Server Configuration</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="#follow-the-install-wizard">Follow the Install Wizard</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="#note">Note</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="installation_others.html">PageKite Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="installation_others.html#open-wrt">Open Wrt</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../apps/index.html">Apps</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../sharing_api/index.html">Sharing API</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../config/index.html">The Configuration File</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <div class="section" id="manual-installation">
 +<h1>Manual Installation<a class="headerlink" href="#manual-installation" title="Permalink to this headline">¶</a></h1>
 +<p>If you do not want to use packages, here is how you setup ownCloud on
 +from scratch using a classic <abbr title="Linux, Apache, MySQL, PHP">LAMP</abbr> setup.</p>
 +<p>This document provides a complete walk-through for installing ownCloud
 +on Ubuntu 12.04 LTS Server with Apache and MySQL.
 +It also provides guidelines for installing it on other distributions,
 +webservers and database systems.</p>
 +<p>Although this document tries to describe all aspects of setting up ownCloud,
 +a basic understanding of the Linux operating system and of server administration
 +is required.</p>
 +<div class="section" id="prerequisites">
 +<h2>Prerequisites<a class="headerlink" href="#prerequisites" title="Permalink to this headline">¶</a></h2>
 +<div class="admonition note">
 +<p class="first admonition-title">Note</p>
 +<p class="last">This tutorial assumes you have terminal access to the machine you want
 +to install owncloud on. Although this is not an absolute requirement,
 +installation without it is highly likely to require contacting your
 +hoster (e.g. for installing required modules).</p>
 +</div>
 +<p>To run ownCloud, your web server must have the following installed:</p>
 +<ul class="simple">
 +<li>PHP (>= 5.3.3 minimum, 5.4 or higher recommended)</li>
 +<li>PHP module ctype</li>
 +<li>PHP module dom</li>
 +<li>PHP module GD</li>
 +<li>PHP module iconv</li>
 +<li>PHP module JSON</li>
 +<li>PHP module libxml</li>
 +<li>PHP module mb multibyte</li>
 +<li>PHP module SimpleXML</li>
 +<li>PHP module zip</li>
 +<li>PHP module zlib</li>
 +</ul>
 +<p>Database connectors (pick at least one):</p>
 +<ul class="simple">
 +<li>PHP module sqlite (requires sqlite >= 3.0; simple configuration, but inferior performance)</li>
 +<li>PHP module mysql</li>
 +<li>PHP module pgsql (requires PostgreSQL >= 9.0)</li>
 +</ul>
 +<p><em>Recommended</em> packages:</p>
 +<ul class="simple">
 +<li>PHP module curl (highly recommended, some functionality, e.g. http user
 +authentication, depends on this)</li>
 +<li>PHP module fileinfo (highly recommended, enhances file analysis performance)</li>
 +<li>PHP module bz2 (recommended, required for extraction of apps)</li>
 +<li>PHP module intl (increases language translation performance)</li>
 +<li>PHP module mcrypt (increases file encryption performance)</li>
 +<li>PHP module openssl (required for accessing HTTPS resources)</li>
 +</ul>
 +<p>Required for specific apps (if you use the mentioned app, you must install that
 +package):</p>
 +<ul class="simple">
 +<li>PHP module ldap (for ldap integration)</li>
 +<li>smbclient (for SMB storage)</li>
 +<li>PHP module ftp (for FTP storage)</li>
 +</ul>
 +<p>Recommended for specific apps (<em>optional</em>):</p>
 +<ul class="simple">
 +<li>PHP module exif (for image rotation in pictures app)</li>
 +</ul>
 +<p>For enhanced performance (<em>optional</em> / select only one of the following):</p>
 +<ul class="simple">
 +<li>PHP module apc</li>
 +<li>PHP module apcu</li>
 +<li>PHP module xcache</li>
 +</ul>
 +<p>For preview generation (<em>optional</em>):</p>
 +<ul class="simple">
 +<li>PHP module imagick</li>
 +<li>avconv or ffmpeg</li>
 +<li>OpenOffice or libreOffice</li>
 +</ul>
 +<p><strong>Remarks:</strong></p>
 +<ul>
 +<li><p class="first">Please check your distribution, operating system or hosting partner documentation
 +on how to install/enable these modules.</p>
 +</li>
 +<li><p class="first">Make sure your distribution’s php version fulfils the version requirements
 +specified above. If it doesn’t, there might be custom repositories you can
 +use. If you are e.g. running Ubuntu 10.04 LTS, you can update your PHP using
 +a custom <a class="reference external" href="https://launchpad.net/~ondrej/+archive/php5">PHP PPA</a>:</p>
 +<div class="highlight-python"><pre>sudo add-apt-repository ppa:ondrej/php5
 +sudo apt-get update
 +sudo apt-get install php5</pre>
 +</div>
 +</li>
 +<li><p class="first">You don’t need any WebDAV support module for your web server (i.e. Apache’s
 +mod_webdav) to access your ownCloud data via WebDAV. ownCloud has a built-in
 +WebDAV server of its own.</p>
 +</li>
 +</ul>
 +<div class="section" id="installation-of-packages-on-ubuntu-12-04-4-lts-server">
 +<h3>Installation of packages on Ubuntu 12.04.4 LTS Server<a class="headerlink" href="#installation-of-packages-on-ubuntu-12-04-4-lts-server" title="Permalink to this headline">¶</a></h3>
 +<p>On a machine running a pristine Ubuntu 12.04.4 LTS server, you would install the
 +required and recommended modules for a typical ownCloud installation, using
 +Apache and MySQL by issuing the following commands in a terminal:</p>
 +<div class="highlight-python"><pre>sudo apt-get install apache2 mysql-server libapache2-mod-php5
 +sudo apt-get install php5-gd php5-json php5-mysql php5-curl
 +sudo apt-get install php5-intl php5-mcrypt php5-imagick</pre>
 +</div>
 +<p><strong>Remarks:</strong></p>
 +<ul class="simple">
 +<li>This installs the packages for the ownCloud core system. If you are planning on
 +running additional apps, keep in mind that they might require additional packages.
 +See the list above for details.</li>
 +<li>At the execution of each of the above commands you might be prompted whether you
 +want to continue; press “Y” for Yes (that is if your system language is English.
 +You might have to press a different key if you have a different system language).</li>
 +<li>At the installation of the MySQL server, you will be prompted for a root password.
 +Be sure to remember the password you enter there for later use (you will need it
 +during ownCloud database setup).</li>
 +</ul>
 +</div>
 +</div>
 +<div class="section" id="download-extract-and-copy-owncloud-to-your-web-server">
 +<h2>Download, extract and copy ownCloud to Your Web Server<a class="headerlink" href="#download-extract-and-copy-owncloud-to-your-web-server" title="Permalink to this headline">¶</a></h2>
 +<p>First, download the archive of the latest ownCloud version:</p>
 +<ul>
 +<li><p class="first">Navigate to the <a class="reference external" href="http://owncloud.org/install">ownCloud Installation Page</a></p>
 +</li>
 +<li><p class="first">Click “Tar or Zip file”</p>
 +</li>
 +<li><p class="first">In the opening dialog, chose the “Linux” link.</p>
 +</li>
 +<li><p class="first">This will start the download of a file named owncloud-x.y.z.tar.bz2 (where
 +x.y.z is the version number of the current latest version).</p>
 +</li>
 +<li><p class="first">Save this file on the machine you want to install ownCloud on.
 +If that’s a different machine than the one you are currently working on, use
 +e.g. FTP to transfer the downloaded archive file there.</p>
 +</li>
 +<li><p class="first">Extract the archive contents. Open a terminal and run:</p>
 +<div class="highlight-python"><pre>cd path/to/downloaded/archive
 +tar -xjf owncloud-x.y.z.tar.bz2</pre>
 +</div>
 +<p>where <tt class="docutils literal"><span class="pre">path/to/downloaded/archive</span></tt> is to be replaced by the path where you
 +put the downloaded archive, and x.y.z of course has to be replaced by the actual
 +version number as in the file you have downloaded.</p>
 +</li>
 +<li><p class="first">Copy the ownCloud files to their final destination in the document root of your
 +webserver (you can skip this step if you already downloaded and extracted the
 +files there):</p>
 +<div class="highlight-python"><pre>sudo cp -r owncloud /path/to/your/webservers/document-root</pre>
 +</div>
 +<p>where <tt class="docutils literal"><span class="pre">/path/to/your/webservers/document-root</span></tt>, needs to be replaced by the
 +actual path where the document root of your webserver is configured to be.</p>
 +<ul>
 +<li><p class="first">If you don’t know where your webserver’s document root is located, consult
 +its documentation. For Apache on Ubuntu 12.04 LTS for example, this would
 +usually be <tt class="docutils literal"><span class="pre">/var/www</span></tt>. So the concrete command to run would be:</p>
 +<div class="highlight-python"><pre>sudo cp -r owncloud /var/www</pre>
 +</div>
 +</li>
 +<li><p class="first">The above assumes you want to install ownCloud into a subdirectory “owncloud”
 +on your webserver. For installing it anywhere else, you’ll have to adapt the
 +above command (and also the commands in the following section) accordingly.</p>
 +</li>
 +</ul>
 +</li>
 +</ul>
 +</div>
 +<div class="section" id="set-the-directory-permissions">
 +<h2>Set the Directory Permissions<a class="headerlink" href="#set-the-directory-permissions" title="Permalink to this headline">¶</a></h2>
 +<p>The user running your web server must own at least the config/, data/ and apps/
 +directories in your ownCloud installation folder so that you can configure ownCloud,
 +create/modify and delete your data files through ownCloud and install apps through
 +the web interface. If you are planning on also using the automatic updater app for
 +updating, the whole <tt class="docutils literal"><span class="pre">owncloud</span></tt> folder must be owned by (or at least be writable to)
 +the user running php on your system.</p>
 +<div class="admonition note">
 +<p class="first admonition-title">Note</p>
 +<p class="last">When using an NFS mount for the data directory, do not change ownership as above.
 +The simple act of mounting the drive will set proper permissions for ownCloud to
 +write to the directory. Changing ownership as above could result in some issues
 +if the NFS mount is lost.</p>
 +</div>
 +<p>The following command will change the ownership of the whole ownCloud folder to
 +that user.</p>
 +<ul>
 +<li><p class="first">The generic command to run is:</p>
 +<div class="highlight-python"><pre>sudo chown -R <php-user>:<php-user> /path/to/your/webservers/document-root/owncloud</pre>
 +</div>
 +<p>where <tt class="docutils literal"><span class="pre"><php-user></span></tt> is to be replaced by the user running php scripts, and
 +<tt class="docutils literal"><span class="pre">/path/to/your/webservers/document-root/owncloud</span></tt> by the folder where the
 +extracted ownCloud files are located.</p>
 +</li>
 +<li><p class="first">For Ubuntu 12.04 LTS server, where the <tt class="docutils literal"><span class="pre">owncloud</span></tt> folder was copied into the
 +Apache document root at <tt class="docutils literal"><span class="pre">/var/www</span></tt>, and the user running Apache and php
 +scripts is called <tt class="docutils literal"><span class="pre">www-data</span></tt>, this would mean you need to run:</p>
 +<div class="highlight-python"><pre>sudo chown -R www-data:www-data /var/www/owncloud</pre>
 +</div>
 +</li>
 +<li><p class="first">For all Debian-based distributions (like Ubuntu, Debian or Linux Mint) and Gentoo,
 +use <tt class="docutils literal"><span class="pre">www-data</span></tt> user</p>
 +</li>
 +<li><p class="first">On ArchLinux, use <tt class="docutils literal"><span class="pre">http</span></tt> user.</p>
 +</li>
 +<li><p class="first">On Fedora, use <tt class="docutils literal"><span class="pre">apache</span></tt> user.</p>
 +</li>
 +<li><p class="first">When you had extracted ownCloud as user <tt class="docutils literal"><span class="pre">root</span></tt>, you should adjust file and directory
 +permission to avoid world writeable files and folder:</p>
 +<div class="highlight-python"><pre>find /path/to/your/webservers/document-root/owncloud -type d -exec chmod 750 {} \;
 +find /path/to/your/webservers/document-root/owncloud -type f -exec chmod 640 {} \;</pre>
 +</div>
 +<p>Running this in combination with the above <tt class="docutils literal"><span class="pre">chown</span></tt> command will give a secure
 +set-up.</p>
 +</li>
 +</ul>
 +</div>
 +<div class="section" id="web-server-configuration">
 +<h2>Web Server Configuration<a class="headerlink" href="#web-server-configuration" title="Permalink to this headline">¶</a></h2>
 +<div class="admonition note">
 +<p class="first admonition-title">Note</p>
 +<p class="last">You can use ownCloud over plain http, but we strongly encourage you to
 +use SSL/TLS. If you don’t use it, and you for example access your
 +ownCloud over an unsecured WiFi, everyone in the same WiFi can grab
 +your authentication data or the content of files synchronized while you
 +are on the WiFi.</p>
 +</div>
 +<p>Apache is the recommended web server.</p>
 +<div class="section" id="apache-configuration">
 +<h3>Apache Configuration<a class="headerlink" href="#apache-configuration" title="Permalink to this headline">¶</a></h3>
 +<div class="section" id="enabling-ssl">
 +<h4>Enabling SSL<a class="headerlink" href="#enabling-ssl" title="Permalink to this headline">¶</a></h4>
 +<p>An Apache installed under Ubuntu comes already set-up with a simple
 +self-signed certificate. All you have to do is to enable the ssl module and
 +the according site. Open a terminal and run:</p>
 +<div class="highlight-python"><pre>sudo a2enmod ssl
 +sudo a2ensite default-ssl
 +sudo service apache2 reload</pre>
 +</div>
 +<p>If you are using a different distribution, check their documentation on how to
 +enable SSL.</p>
 +<div class="admonition note">
 +<p class="first admonition-title">Note</p>
 +<p class="last">Self-signed certificates have their drawbacks - especially when you
 +plan to make your ownCloud server publicly accessible. You might want
 +to consider getting a certificate signed by an official signing
 +authority. SSLShopper for example has an article on your
 +<a class="reference external" href="https://www.sslshopper.com/article-free-ssl-certificates-from-a-free-certificate-authority.html">options for free SSL certificates</a>.</p>
 +</div>
 +</div>
 +<div class="section" id="configuring-owncloud">
 +<h4>Configuring ownCloud<a class="headerlink" href="#configuring-owncloud" title="Permalink to this headline">¶</a></h4>
 +<p>Since there was a change in the way versions 2.2 and 2.4 are configured,
 +you’ll have to find out which Apache version you are using.</p>
 +<p>Usually you can do this by running one of the following commands:</p>
 +<div class="highlight-python"><pre>sudo apachectl -v
 +apache2 -v</pre>
 +</div>
 +<p>Example output:</p>
 +<div class="highlight-python"><pre>Server version: Apache/2.2.22 (Ubuntu)
 +Server built:   Jul 12 2013 13:37:10</pre>
 +</div>
 +<p>This indicates an Apache of the 2.2 version branch (as e.g. you will find on
 +Ubuntu 12.04 LTS).</p>
 +<p>Example config for Apache 2.2:</p>
 +<div class="highlight-xml"><pre><Directory /path/to/your/owncloud/install>
 +    Options Indexes FollowSymLinks MultiViews
 +    AllowOverride All
 +    Order allow,deny
 +    allow from all
 +</Directory></pre>
 +</div>
 +<p>Example config for Apache 2.4:</p>
 +<div class="highlight-xml"><pre><Directory /path/to/your/owncloud/install>
 +    Options Indexes FollowSymLinks MultiViews
 +    AllowOverride All
 +    Require all granted
 +</Directory></pre>
 +</div>
 +<ul>
 +<li><p class="first">This config entry needs to go into the configuration file of the “site” you want
 +to use.</p>
 +</li>
 +<li><p class="first">On a Ubuntu system, this typically is the “default-ssl” site (to be found in
 +the <tt class="file docutils literal"><span class="pre">/etc/apache2/sites-available/default-ssl</span></tt>).</p>
 +</li>
 +<li><p class="first">Edit the site file with your favorite editor (note that you’ll need root
 +permissions to modify that file). For Ubuntu 12.04 LTS, you could for example run
 +the following command in a Terminal:</p>
 +<div class="highlight-python"><pre>sudo nano /etc/apache2/sites-available/default-ssl</pre>
 +</div>
 +</li>
 +<li><p class="first">Add the entry shown above immediately before the line containing:</p>
 +<div class="highlight-python"><pre></VirtualHost></pre>
 +</div>
 +<p>(this should be one of the last lines in the file).</p>
 +</li>
 +<li><p class="first">A minimal site configuration file on Ubuntu 12.04 might look like this:</p>
 +</li>
 +</ul>
 +<div class="highlight-xml"><pre><IfModule mod_ssl.c>
 +<VirtualHost _default_:443>
 +        ServerName YourServerName
 +        ServerAdmin webmaster at localhost
 +        DocumentRoot /var/www
 +        <Directory />
 +                Options FollowSymLinks
 +                AllowOverride None
 +        </Directory>
 +        <Directory /var/www/>
 +                Options Indexes FollowSymLinks MultiViews
 +                AllowOverride None
 +                Order allow,deny
 +                allow from all
 +        </Directory>
 +        ErrorLog ${APACHE_LOG_DIR}/error.log
 +        LogLevel warn
 +        CustomLog ${APACHE_LOG_DIR}/ssl_access.log combined
 +        SSLEngine on
 +        SSLCertificateFile    /etc/ssl/certs/ssl-cert-snakeoil.pem
 +        SSLCertificateKeyFile /etc/ssl/private/ssl-cert-snakeoil.key
 +        <FilesMatch "\.(cgi|shtml|phtml|php)$">
 +                SSLOptions +StdEnvVars
 +        </FilesMatch>
 +        <Directory /usr/lib/cgi-bin>
 +                SSLOptions +StdEnvVars
 +        </Directory>
 +        BrowserMatch "MSIE [2-6]" \
 +                nokeepalive ssl-unclean-shutdown \
 +                downgrade-1.0 force-response-1.0
 +        BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown
 +        <Directory /var/www/owncloud>
 +                Options Indexes FollowSymLinks MultiViews
 +                AllowOverride All
 +                Order allow,deny
 +                Allow from all
 +                # add any possibly required additional directives here
 +                # e.g. the Satisfy directive (see below for details):
 +                Satisfy Any
 +        </Directory>
 +</VirtualHost>
 +</IfModule></pre>
 +</div>
 +<ul>
 +<li><p class="first">For ownCloud to work correctly, we need the module mod_rewrite. Enable it by running:</p>
 +<div class="highlight-python"><pre>sudo a2enmod rewrite</pre>
 +</div>
 +</li>
 +<li><p class="first">In distributions that do not come with <tt class="docutils literal"><span class="pre">a2enmod</span></tt>, the module needs to be
 +enabled manually by editing the Apache config files, usually <tt class="file docutils literal"><span class="pre">/etc/httpd/httpd.conf</span></tt>.
 +consult the Apache documentation or your distributions documentation.</p>
 +</li>
 +<li><p class="first">In order for the maximum upload size to be configurable, the
 +<tt class="file docutils literal"><span class="pre">.htaccess</span></tt> in the ownCloud folder needs to be made writable by the
 +server (this should already be done, see section <a class="reference internal" href="#set-the-directory-permissions">Set the Directory Permissions</a>).</p>
 +</li>
 +<li><p class="first">You should make sure that any built-in WebDAV module of your web server is disabled
 +(at least for the ownCloud directory), as it will interfere with ownCloud’s
 +built-in WebDAV support.</p>
 +<p>If you need the WebDAV support in the rest of your configuration, you can turn it off
 +specifically for the ownCloud entry by adding the following line in the
 +configuration of your ownCloud. In above “<Directory ...” code, add the following line
 +directly after the <tt class="docutils literal"><span class="pre">allow</span> <span class="pre">from</span> <span class="pre">all</span></tt> / <tt class="docutils literal"><span class="pre">Require</span> <span class="pre">all</span> <span class="pre">granted</span></tt> line):</p>
 +<div class="highlight-python"><pre>Dav Off</pre>
 +</div>
 +</li>
 +<li><p class="first">Furthermore, you need to disable any server-configured authentication for ownCloud, as
 +it’s internally using Basic authentication for its *DAV services.
 +If you have turned on authentication on a parent folder (via e.g. an <tt class="docutils literal"><span class="pre">AuthType</span> <span class="pre">Basic</span></tt>
 +directive), you can turn off the authentication specifically for the ownCloud entry;
 +to do so, in above “<Directory ...” code, add the following line directly after the
 +<tt class="docutils literal"><span class="pre">allow</span> <span class="pre">from</span> <span class="pre">all</span></tt> / <tt class="docutils literal"><span class="pre">Require</span> <span class="pre">all</span> <span class="pre">granted</span></tt> line):</p>
 +<div class="highlight-python"><pre>Satisfy Any</pre>
 +</div>
 +</li>
 +<li><p class="first">When using ssl, take special note on the ServerName. You should specify one in the
 +server configuration, as well as in the CommonName field of the certificate. If you want
 +your ownCloud to be reachable via the internet, then set both these to the domain you
 +want to reach your ownCloud under.</p>
 +</li>
 +</ul>
 +<div class="admonition note">
 +<p class="first admonition-title">Note</p>
 +<p class="last">By default, the certificates’ CommonName will get set to the host
 +name at the time when the ssl-cert package was installed.</p>
 +</div>
 +<ul>
 +<li><p class="first">Finally, restart Apache.</p>
 +<ul>
 +<li><p class="first">For Ubuntu systems (or distributions using upstartd), run:</p>
 +<div class="highlight-python"><pre>sudo service apache2 restart</pre>
 +</div>
 +</li>
 +<li><p class="first">For systemd systems (Fedora, ArchLinux, OpenSUSE), run:</p>
 +<div class="highlight-python"><pre>systemctl restart httpd.service</pre>
 +</div>
 +</li>
 +</ul>
 +</li>
 +</ul>
 +</div>
 +</div>
 +<div class="section" id="nginx-configuration">
 +<h3>Nginx Configuration<a class="headerlink" href="#nginx-configuration" title="Permalink to this headline">¶</a></h3>
 +<ul>
 +<li><p class="first">You need to insert the following code into <strong>your nginx config file.</strong></p>
 +</li>
 +<li><p class="first">Adjust <strong>server_name</strong>, <strong>root</strong>, <strong>ssl_certificate</strong> and <strong>ssl_certificate_key</strong> to suit your needs.</p>
 +</li>
 +<li><dl class="first docutils">
 +<dt>Make sure your SSL certificates are readable by the server (see the</dt>
 +<dd><p class="first last"><a class="reference external" href="http://wiki.nginx.org/HttpSslModule">Nginx HTTP SSL Module documentation</a>).</p>
 +</dd>
 +</dl>
 +</li>
 +</ul>
 +<div class="highlight-python"><pre>upstream php-handler {
 +        server 127.0.0.1:9000;
 +        #server unix:/var/run/php5-fpm.sock;
 +}
 +
 +server {
 +        listen 80;
 +        server_name cloud.example.com;
 +        return 301 https://$server_name$request_uri;  # enforce https
 +}
 +
 +server {
 +        listen 443 ssl;
 +        server_name cloud.example.com;
 +
 +        ssl_certificate /etc/ssl/nginx/cloud.example.com.crt;
 +        ssl_certificate_key /etc/ssl/nginx/cloud.example.com.key;
 +
 +        # Path to the root of your installation
 +        root /var/www/;
 +
 +        client_max_body_size 10G; # set max upload size
 +        fastcgi_buffers 64 4K;
 +
 +        rewrite ^/caldav(.*)$ /remote.php/caldav$1 redirect;
 +        rewrite ^/carddav(.*)$ /remote.php/carddav$1 redirect;
 +        rewrite ^/webdav(.*)$ /remote.php/webdav$1 redirect;
 +
 +        index index.php;
 +        error_page 403 /core/templates/403.php;
 +        error_page 404 /core/templates/404.php;
 +
 +        location = /robots.txt {
 +            allow all;
 +            log_not_found off;
 +            access_log off;
 +        }
 +
 +        location ~ ^/(data|config|\.ht|db_structure\.xml|README) {
 +                deny all;
 +        }
 +
 +        location / {
 +                # The following 2 rules are only needed with webfinger
 +                rewrite ^/.well-known/host-meta /public.php?service=host-meta last;
 +                rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last;
 +
 +                rewrite ^/.well-known/carddav /remote.php/carddav/ redirect;
 +                rewrite ^/.well-known/caldav /remote.php/caldav/ redirect;
 +
 +                rewrite ^(/core/doc/[^\/]+/)$ $1/index.html;
 +
 +                try_files $uri $uri/ index.php;
 +        }
 +
 +        location ~ ^(.+?\.php)(/.*)?$ {
 +                try_files $1 =404;
 +
 +                include fastcgi_params;
 +                fastcgi_param SCRIPT_FILENAME $document_root$1;
 +                fastcgi_param PATH_INFO $2;
 +                fastcgi_param HTTPS on;
 +                fastcgi_pass php-handler;
 +        }
 +
 +        # Optional: set long EXPIRES header on static assets
 +        location ~* ^.+\.(jpg|jpeg|gif|bmp|ico|png|css|js|swf)$ {
 +                expires 30d;
 +                # Optional: Don't log access to assets
 +                access_log off;
 +        }
 +
 +}</pre>
 +</div>
 +<p>To enable SSL support:
 +-  Remove the server block containing the redirect
 +-  Change <strong>listen 443 ssl</strong> to <strong>listen 80;</strong>
 +-  Remove <strong>ssl_certificate</strong> and <strong>ssl_certificate_key</strong>.
 +-  Remove <strong>fastcgi_params HTTPS on;</strong></p>
 +<div class="admonition note">
 +<p class="first admonition-title">Note</p>
 +<p class="last">If you want to effectively increase maximum upload size you will also
 +have to modify your <strong>php-fpm configuration</strong> (<strong>usually at
 +/etc/php5/fpm/php.ini</strong>) and increase <strong>upload_max_filesize</strong> and
 +<strong>post_max_size</strong> values. You’ll need to restart php5-fpm and nginx
 +services in order these changes to be applied.</p>
 +</div>
 +</div>
 +<div class="section" id="lighttpd-configuration">
 +<h3>Lighttpd Configuration<a class="headerlink" href="#lighttpd-configuration" title="Permalink to this headline">¶</a></h3>
 +<p>This assumes that you are familiar with installing PHP application on
 +lighttpd.</p>
 +<p>It is important to note that the <tt class="file docutils literal"><span class="pre">.htaccess</span></tt> used by ownCloud to
 +protect the <tt class="file docutils literal"><span class="pre">data</span></tt> folder are ignored by lighttpd, so you have to secure
 +it by yourself, otherwise your <tt class="file docutils literal"><span class="pre">owncloud.db</span></tt> database and user data are
 +publicly readable even if directory listing is off. You need to add two
 +snippets to your lighttpd configuration file:</p>
 +<p>Disable access to data folder:</p>
 +<div class="highlight-python"><pre>$HTTP["url"] =~ "^/owncloud/data/" {
 +        url.access-deny = ("")
 +}</pre>
 +</div>
 +<p>Disable directory listing:</p>
 +<div class="highlight-python"><pre>$HTTP["url"] =~ "^/owncloud($|/)" {
 +        dir-listing.activate = "disable"
 +}</pre>
 +</div>
 +<p><strong>Note for Lighttpd users on Debian stable (wheezy):</strong></p>
 +<p>Recent versions of ownCloud make use of the <strong>HTTP PATCH</strong> feature, which was added to Lighttpd at version 1.4.32 while Debian stable only ships 1.4.31. The patch is simple, however, and easy to integrate if you’re willing to build your own package.</p>
 +<p>Download the patch from <a class="reference external" href="http://redmine.lighttpd.net/attachments/download/1370/patch.patch">http://redmine.lighttpd.net/attachments/download/1370/patch.patch</a></p>
 +<p>Make sure you have the build tools you need:</p>
 +<div class="highlight-python"><pre>apt-get build-dep lighttpd
 +apt-get install quilt patch devscripts</pre>
 +</div>
 +<p>Patch the package source:</p>
 +<div class="highlight-python"><pre>apt-get source lighttpd
 +cd lighttpd-1.4.31
 +export QUILT_PATCHES=debian/patches # This tells quilt to put the patch in the right spot
 +quilt new http-patch.patch
 +quilt add src/connections.c src/keyvalue.c src/keyvalue.h # Make quilt watch the files we'll be changing
 +patch -p1 -i /patch/to/downloaded/patch.patch
 +quilt refresh</pre>
 +</div>
 +<p>Increment the package version with <tt class="docutils literal"><span class="pre">dch</span> <span class="pre">-i</span></tt>. This will open the changelog with a new entry. You can save as-is or add info to it. The important bit is that the version is bumped so apt will not try to “upgrade” back to Debian’s version.</p>
 +<p>Then build with <tt class="docutils literal"><span class="pre">debuild</span></tt> and install the .debs for any Lighttpd packages you already have installed.</p>
 +</div>
 +<div class="section" id="yaws-configuration">
 +<h3>Yaws Configuration<a class="headerlink" href="#yaws-configuration" title="Permalink to this headline">¶</a></h3>
 +<p>This should be in your <strong>yaws_server.conf</strong>. In the configuration file, the
 +<strong>dir_listings = false</strong> is important and also the redirect from <strong>/data</strong>
 +to somewhere else, because files will be saved in this directory and it
 +should not be accessible from the outside. A configuration file would look
 +like this</p>
 +<div class="highlight-xml"><pre><server owncloud.myserver.com/>
 +        port = 80
 +        listen = 0.0.0.0
 +        docroot = /var/www/owncloud/src
 +        allowed_scripts = php
 +        php_handler = <cgi, /usr/local/bin/php-cgi>
 +        errormod_404 = yaws_404_to_index_php
 +        access_log = false
 +        dir_listings = false
 +        <redirect>
 +                /data == /
 +        </redirect>
 +</server></pre>
 +</div>
 +<p>The Apache <tt class="file docutils literal"><span class="pre">.htaccess</span></tt> that comes with ownCloud is configured to
 +redirect requests to nonexistent pages. To emulate that behaviour, you
 +need a custom error handler for yaws. See this
 +<a class="reference external" href="https://gist.github.com/2200407">github gist for further instructions</a> on how to create and compile that error
 +handler.</p>
 +</div>
 +<div class="section" id="hiawatha-configuration">
 +<h3>Hiawatha Configuration<a class="headerlink" href="#hiawatha-configuration" title="Permalink to this headline">¶</a></h3>
 +<p>Add <tt class="docutils literal"><span class="pre">WebDAVapp</span> <span class="pre">=</span> <span class="pre">yes</span></tt> to the ownCloud virtual host. Users accessing
 +WebDAV from MacOS will also need to add <tt class="docutils literal"><span class="pre">AllowDotFiles</span> <span class="pre">=</span> <span class="pre">yes</span></tt>.</p>
 +<p>Disable access to data folder:</p>
 +<div class="highlight-python"><pre>UrlToolkit {
 +    ToolkitID = denyData
 +    Match ^/data DenyAccess
 +}</pre>
 +</div>
 +</div>
 +<div class="section" id="microsoft-internet-information-server-iis">
 +<h3>Microsoft Internet Information Server (IIS)<a class="headerlink" href="#microsoft-internet-information-server-iis" title="Permalink to this headline">¶</a></h3>
 +<p>See <a class="reference internal" href="installation_windows.html"><em>Windows 7 and Windows Server 2008</em></a> for further instructions.</p>
 +</div>
 +</div>
 +<div class="section" id="follow-the-install-wizard">
 +<h2>Follow the Install Wizard<a class="headerlink" href="#follow-the-install-wizard" title="Permalink to this headline">¶</a></h2>
 +<ul class="simple">
 +<li>Open your web browser</li>
 +<li>Navigate to your ownCloud instance.<ul>
 +<li>If you are installing ownCloud on the same machine as you are accessing the
 +install wizard from, the url will be <a class="reference external" href="https://localhost/owncloud">https://localhost/owncloud</a></li>
 +<li>If you are installing ownCloud on a different machine, you’ll have to access
 +it by its hostname or IP address, e.g. <a class="reference external" href="https://example.com/owncloud">https://example.com/owncloud</a></li>
 +<li>If you are using a self-signed certificate, you will be presented with a
 +security warning about the issuer of the certificate not being trusted which
 +you can ignore.</li>
 +</ul>
 +</li>
 +<li>You will be presented with the setup screen</li>
 +<li>Enter username and password for the administrative user account</li>
 +<li>Expand Advanced options to choose a data folder and the database system</li>
 +<li>If you are not using Apache as the web server, please set the data directory
 +to a location outside of the document root.</li>
 +<li>If following the Ubuntu-Apache-MySQL walk-through:<ul>
 +<li>choose MySQL as Database backend (you might not be presented with any other
 +choice if you haven’t installed any other database systems).</li>
 +<li>As Database host, enter <tt class="docutils literal"><span class="pre">localhost</span></tt>.</li>
 +<li>As Database user enter <tt class="docutils literal"><span class="pre">root</span></tt>.</li>
 +<li>As Database password, enter the password you entered during installation of
 +the MySQL server package.</li>
 +<li>As Database name, enter an arbitrary name as you see fit<ul>
 +<li>Beware that there are restrictions as to what characters a database name
 +may or may not contain, see the
 +<a class="reference external" href="http://dev.mysql.com/doc/refman/5.5/en/identifiers.html">MySQL Schema Object Names documentation</a> for details);</li>
 +<li>Make sure to choose a name under which no database exists yet</li>
 +</ul>
 +</li>
 +<li>ownCloud will use the provided credentials and create its own user with
 +permissions only on its own database.</li>
 +</ul>
 +</li>
 +<li>In general, you have the following choices regarding the database:<ul>
 +<li>For basic installs we recommend SQLite as it is easy to setup (ownCloud will do
 +it for you). The performance when using sqlite is however inferior to the two
 +other options.</li>
 +<li>For larger installs you should use MySQL or PostgreSQL.</li>
 +<li>Note that you will only be able to choose among the php database connectors
 +which are actually installed on the system (see package requirements above).</li>
 +<li>Further, it is not easily possible to migrate to another database system
 +once you have set up your ownCloud to use a specific one. So make sure to
 +carefully consider which database system to use.</li>
 +<li>When using MySQL or PostgreSQL you have two options  regarding the database
 +name and user account you specify:<ul>
 +<li>You can specify either an admin/root user, and the name of a database
 +which does not yet exist. This lets ownCloud create its own database; it
 +will also create a database user account with restricted rights (with the
 +same username as you specified for the administrative user, plus an
 +<tt class="docutils literal"><span class="pre">oc_</span></tt> prefix) and will use that for all subsequent database access.</li>
 +<li>You can enter the name of an existing database and the username/password
 +of a user with restricted permissions<ul>
 +<li>You can create such a user yourself e.g. via phpmyadmin.</li>
 +<li>This user shouldn’t have permission to create a database.</li>
 +<li>It should have full permissions on the (existing) database with the
 +name you specify.</li>
 +</ul>
 +</li>
 +</ul>
 +</li>
 +</ul>
 +</li>
 +<li>Press “Finish Setup”</li>
 +<li>ownCloud will set up your cloud according to the given settings</li>
 +<li>When its finished, it will log you in as administrative user and present the
 +“Welcome to ownCloud” screen.</li>
 +</ul>
 +</div>
 +<div class="section" id="note">
 +<h2>Note<a class="headerlink" href="#note" title="Permalink to this headline">¶</a></h2>
 +<p>When the initial ownCloud configuration is performed, ownCloud will take the URL used to access it and insert that
 +the config.php file under the ‘trusted_domains’ header.</p>
 +<p>Users will only be able to log into ownCloud when the addressed URL is as stated in the ‘trusted_domans’  header
 +in the config.php file.</p>
 +<p>In the event that a load balancer is in place, as long as it sends the correct X-Forwarded-Host header, there will
 +be no issues.</p>
 +<p>It should be noted that the loopback address, 127.0.0.1, is white labeled and therefore users on the ownCloud
 +server who access ownCloud with the loopback will successfully login.
 +In the event that an improper URL is used, the following error will appear:</p>
 +<img alt="../_images/untrusted-domain.png" src="../_images/untrusted-domain.png" />
 +<p>For configuration examples, refer to the config.php document.</p>
 +</div>
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/installation/installation_ucs.html
index 22a6fb2,0000000..ff7446f
mode 100644,000000..100644
--- a/core/doc/admin/installation/installation_ucs.html
+++ b/core/doc/admin/installation/installation_ucs.html
@@@ -1,411 -1,0 +1,414 @@@
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>Univention Corporate Server — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '../',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="../_static/jquery.js"></script>
 +    <script type="text/javascript" src="../_static/underscore.js"></script>
 +    <script type="text/javascript" src="../_static/doctools.js"></script>
 +    <script type="text/javascript" src="../_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
 +    <link rel="up" title="Installation" href="index.html" />
 +    <link rel="next" title="Manual Installation" href="installation_source.html" />
 +    <link rel="prev" title="Windows 7 and Windows Server 2008" href="installation_windows.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="../contents.html">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
 +<ul class="current">
 +<li class="toctree-l1 current"><a class="reference internal" href="index.html">Installation</a><ul class="current">
 +<li class="toctree-l2"><a class="reference internal" href="installation_appliance.html">Appliances</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="installation_linux.html">Linux Distributions</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="installation_macos.html">Mac OS X</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="installation_windows.html">Windows 7 and Windows Server 2008</a></li>
 +<li class="toctree-l2 current"><a class="current reference internal" href="">Univention Corporate Server</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="#pre-configuration">Pre configuration</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="#installation">Installation</a></li>
- <li class="toctree-l3"><a class="reference internal" href="#postconfiguration-optional">Postconfiguration (optional)</a></li>
++<li class="toctree-l3"><a class="reference internal" href="#post-configuration-optional">Post configuration (optional)</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="#using-owncloud">Using ownCloud</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="installation_source.html">Manual Installation</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="installation_others.html">PageKite Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="installation_others.html#open-wrt">Open Wrt</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../apps/index.html">Apps</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../sharing_api/index.html">Sharing API</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../config/index.html">The Configuration File</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <div class="section" id="univention-corporate-server">
 +<h1>Univention Corporate Server<a class="headerlink" href="#univention-corporate-server" title="Permalink to this headline">¶</a></h1>
 +<p>Subscribers to the ownCloud Enterprise edition can also integrate with
 +<abbr title="Univention Corporate Server">UCS</abbr>.</p>
 +<div class="section" id="pre-configuration">
 +<span id="preconfig"></span><h2>Pre configuration<a class="headerlink" href="#pre-configuration" title="Permalink to this headline">¶</a></h2>
 +<p>ownCloud makes use of the UCR, the Univention Configuration Registry. The values
 +are being read during installation, most of them can be changed later, too.
 +Changes done directly via ownCloud are not taken over to UCR. We think we found
 +sane defaults, nevertheless you might have your own requirements. The
 +installation script will listen to the UCR keys listed below. In case you want
 +to override any default setting, simply add the key in question to the UCR and
 +assign your required value.</p>
 +<table border="1" class="longtable docutils">
 +<colgroup>
 +<col width="20%" />
 +<col width="30%" />
 +<col width="30%" />
 +<col width="20%" />
 +</colgroup>
 +<thead valign="bottom">
 +<tr class="row-odd"><th class="head">Key</th>
 +<th class="head">Default</th>
 +<th class="head">Description</th>
 +<th class="head">Introduced</th>
 +</tr>
 +</thead>
 +<tbody valign="top">
 +<tr class="row-even"><td>owncloud/directory/data</td>
 +<td>/var/lib/owncloud</td>
 +<td>Specifies where the file storage will be placed</td>
 +<td>2012.0.1</td>
 +</tr>
 +<tr class="row-odd"><td>owncloud/db/name</td>
 +<td>owncloud</td>
 +<td>Name of the MySQL database. ownCloud will create an own user for it.</td>
 +<td>2012.0.1</td>
 +</tr>
 +<tr class="row-even"><td>owncloud/user/quota</td>
 +<td>(empty)</td>
 +<td>The default quota, when a user is being added. Assign values in human readable strings, e.g. “2 GB”. Unlimited if empty.</td>
 +<td>2012.0.1</td>
 +</tr>
 +<tr class="row-odd"><td>owncloud/user/enabled</td>
 +<td>0</td>
- <td>Wether a new user is allowed to use ownCloud by default.</td>
++<td>Whether a new user is allowed to use ownCloud by default.</td>
 +<td>2012.0.1</td>
 +</tr>
 +<tr class="row-even"><td>owncloud/group/enabled</td>
 +<td>0</td>
- <td>Wether a new group is allowed to be used in ownCloud by default.</td>
++<td>Whether a new group is allowed to be used in ownCloud by default.</td>
 +<td>2012.4.0.4</td>
 +</tr>
 +<tr class="row-odd"><td>owncloud/ldap/base/users</td>
 +<td>cn=users,$ldap_base</td>
 +<td>The users-subtree in the LDAP directory. If left blank it will fall back to the LDAP base.</td>
 +<td>2012.4.0.4</td>
 +</tr>
 +<tr class="row-even"><td>owncloud/ldap/base/groups</td>
 +<td>cn=groups,$ldap_base</td>
 +<td>The groups-subtree in the LDAP directory. If left blank it will fall back to the LDAP base.</td>
 +<td>2012.4.0.4</td>
 +</tr>
 +<tr class="row-odd"><td>owncloud/ldap/groupMemberAssoc</td>
 +<td>uniqueMember</td>
 +<td>The LDAP attribute showing the group-member relationship. Possible values: uniqueMember, memberUid and member</td>
 +<td>2012.4.0.4</td>
 +</tr>
 +<tr class="row-even"><td>owncloud/ldap/tls</td>
 +<td>1</td>
 +<td>Whether to talk to the LDAP server via TLS.</td>
 +<td>2012.0.1</td>
 +</tr>
 +<tr class="row-odd"><td>owncloud/ldap/disableMainServer</td>
 +<td>0</td>
 +<td>Deactivates the (first) LDAP Configuration</td>
 +<td>5.0.9</td>
 +</tr>
 +<tr class="row-even"><td>owncloud/ldap/cacheTTL</td>
 +<td>600</td>
 +<td>Lifetime of the ownCloud LDAP Cache in seconds</td>
 +<td>5.0.9</td>
 +</tr>
 +<tr class="row-odd"><td>owncloud/ldap/UUIDAttribute</td>
 +<td>(empty)</td>
 +<td>Attribute that provides a unique value for each user and group entry. Empty value for autodetection.</td>
 +<td>5.0.9</td>
 +</tr>
 +<tr class="row-even"><td>owncloud/ldap/loginFilter</td>
 +<td>(&(|(&(objectClass=posixAccount) (objectClass=shadowAccount)) (objectClass=univentionMail) (objectClass=sambaSamAccount) (objectClass=simpleSecurityObject) (&(objectClass=person) (objectClass=organizationalPerson) (objectClass=inetOrgPerson))) (!(uidNumber=0)) (!(uid=*$)) (&(uid=%uid) (ownCloudEnabled=1)))</td>
 +<td>The LDAP filter that shall be used when a user tries to log in.</td>
 +<td>2012.0.1</td>
 +</tr>
 +<tr class="row-odd"><td>owncloud/ldap/userlistFilter</td>
 +<td>(&(|(&(objectClass=posixAccount) (objectClass=shadowAccount)) (objectClass=univentionMail) (objectClass=sambaSamAccount) (objectClass=simpleSecurityObject) (&(objectClass=person) (objectClass=organizationalPerson) (objectClass=inetOrgPerson))) (!(uidNumber=0))(!(uid=*$)) (&(ownCloudEnabled=1)))</td>
 +<td>The LDAP filter that shall be used when the user list is being retrieved (e.g. for sharing)</td>
 +<td>2012.0.1</td>
 +</tr>
 +<tr class="row-even"><td>owncloud/ldap/groupFilter</td>
 +<td>(&(objectClass=posixGroup) (ownCloudEnabled=1))</td>
 +<td>The LDAP filter that shall be used when the group list is being retrieved (e.g. for sharing)</td>
 +<td>2012.4.0.4</td>
 +</tr>
 +<tr class="row-odd"><td>owncloud/ldap/internalNameAttribute</td>
 +<td>uid</td>
 +<td>Attribute that should be used to create the user’s owncloud internal name</td>
 +<td>5.0.9</td>
 +</tr>
 +<tr class="row-even"><td>owncloud/ldap/displayName</td>
 +<td>uid</td>
 +<td>The LDAP attribute that should be displayed as name in ownCloud</td>
 +<td>2012.0.1</td>
 +</tr>
 +<tr class="row-odd"><td>owncloud/ldap/user/searchAttributes</td>
 +<td>uid,givenName,sn,description,employeeNumber,mailPrimaryAddress</td>
 +<td>Attributes taken into consideration when searching for users (comma separated)</td>
 +<td>5.0.9</td>
 +</tr>
 +<tr class="row-even"><td>owncloud/ldap/user/quotaAttribute</td>
 +<td>ownCloudQuota</td>
 +<td>Name of the quota attribute. The default attribute is provided by owncloud-schema.</td>
 +<td>5.0.9</td>
 +</tr>
 +<tr class="row-odd"><td>owncloud/ldap/user/homeAttribute</td>
 +<td>(empty)</td>
 +<td>Attribute that should be used to create the user’s owncloud internal home folder</td>
 +<td>5.0.9</td>
 +</tr>
 +<tr class="row-even"><td>owncloud/ldap/group/displayName</td>
 +<td>cn</td>
 +<td>The LDAP attribute that should be used as groupname in ownCloud</td>
 +<td>2012.4.0.4</td>
 +</tr>
 +<tr class="row-odd"><td>owncloud/ldap/group/searchAttributes</td>
 +<td>cn,description, mailPrimaryAddress</td>
 +<td>Attributes taken into consideration when searching for groups (comma separated)</td>
 +<td>5.0.9</td>
 +</tr>
 +<tr class="row-even"><td>owncloud/join/users/update</td>
 +<td>yes</td>
- <td>Wether ownCloud LDAP schema should be applied to existing users</td>
++<td>Whether ownCloud LDAP schema should be applied to existing users</td>
 +<td>2012.0.1</td>
 +</tr>
 +<tr class="row-odd"><td>owncloud/group/enableDomainUsers</td>
 +<td>1</td>
- <td>Wether the group “Domain Users” shall be enabled for ownCloud on install</td>
++<td>Whether the group “Domain Users” shall be enabled for ownCloud on install</td>
 +<td>2012.4.0.4</td>
 +</tr>
 +<tr class="row-even"><td>owncloud/join/users/filter</td>
 +<td>(&(|(&(objectClass=posixAccount) (objectClass=shadowAccount)) (objectClass=univentionMail) (objectClass=sambaSamAccount) (objectClass=simpleSecurityObject) (&(objectClass=person) (objectClass=organizationalPerson) (objectClass=inetOrgPerson))) (!(uidNumber=0)) (!(|(uid=*$) (uid=owncloudsystemuser) (uid=join-backup) (uid=join-slave))) (!(objectClass=ownCloudUser)))</td>
 +<td>Filters, on which LDAP users the ownCloud schema should be applied to. The default excludes system users and already ownCloudUsers.</td>
 +<td>2012.0.1</td>
 +</tr>
 +<tr class="row-odd"><td>owncloud/join/groups/filter</td>
 +<td>(empty)</td>
 +<td>Filters which LDAP groups will be en/disabled for ownCloud when running the script /usr/share/owncloud/update-groups.sh</td>
 +<td>2012.4.0.4</td>
 +</tr>
 +</tbody>
 +</table>
 +<p>If you want to override the default settings, simply create the key in
 +question in the UCR and assign your required value, for example:</p>
 +<div class="highlight-python"><pre>ucr set owncloud/user/enabled=1</pre>
 +</div>
 +<p>or via UMC:</p>
 +<img alt="../_images/ucsint2.png" src="../_images/ucsint2.png" />
 +</div>
 +<div class="section" id="installation">
 +<h2>Installation<a class="headerlink" href="#installation" title="Permalink to this headline">¶</a></h2>
 +<p>Now, we are ready to install ownCloud. This can be either done through the UCS
 +App Center (recommended) or by downloading the packages.</p>
 +<div class="section" id="ucs-app-center">
 +<h3>UCS App Center<a class="headerlink" href="#ucs-app-center" title="Permalink to this headline">¶</a></h3>
 +<p>Open the Univention Management Console and choose the App Center module. You
 +will see a variety of available applications, including ownCloud.</p>
 +<img alt="../_images/ucs-app-center-module.png" src="../_images/ucs-app-center-module.png" />
 +<p>Click on ownCloud 5 and follow the instructions.</p>
 +<img alt="../_images/ucs-app-center-install.png" src="../_images/ucs-app-center-install.png" />
 +<p>In the UCS App Center, you can also upgrade from ownCloud 4.5 by installing
 +ownCloud 5.0. They are provided as separate apps. It is only possible to have
 +one version of ownCloud installed.</p>
 +</div>
 +<div class="section" id="manually-by-download">
 +<h3>Manually by download<a class="headerlink" href="#manually-by-download" title="Permalink to this headline">¶</a></h3>
 +<p>Download the integration packages <a class="reference external" href="https://owncloud.com/download">from our website</a> and install them from
 +within your download folder (note: the package owncloud-unsupported is
 +optional) via command line:</p>
 +<div class="highlight-python"><pre>dpkg -i owncloud*.deb</pre>
 +</div>
 +<p>ownCloud will be configured to fully work with LDAP.</p>
 +</div>
- <div class="section" id="reinstallation">
- <h3>Reinstallation<a class="headerlink" href="#reinstallation" title="Permalink to this headline">¶</a></h3>
++<div class="section" id="re-installation">
++<h3>Re-installation<a class="headerlink" href="#re-installation" title="Permalink to this headline">¶</a></h3>
 +<p>When ownCloud was installed before and uninstalled via AppCenter or via command
 +line using apt-get remove, ownCloud can be simply installed again. The old
 +configuration will be used again.</p>
 +<p>When an older ownCloud was installed and has been purged (only possible via
 +command line using apt-get purge) the old configuration is gone, but data is
 +left. This blocks an installation. You can either install the old version and
 +upgrade to ownCloud 5 or (re)move the old data. This is done by removing the
 +MySQL database “ownCloud” using the command line:</p>
 +<div class="highlight-python"><pre>mysql -u root -e "DROP DATABASE owncloud" -p`tail /etc/mysql.secret</pre>
 +</div>
 +<p>In this case you probably also want to remove the data directory
 +<strong>/var/lib/owncloud</strong> although this is not mandatory.</p>
 +</div>
 +</div>
- <div class="section" id="postconfiguration-optional">
- <h2>Postconfiguration (optional)<a class="headerlink" href="#postconfiguration-optional" title="Permalink to this headline">¶</a></h2>
++<div class="section" id="post-configuration-optional">
++<h2>Post configuration (optional)<a class="headerlink" href="#post-configuration-optional" title="Permalink to this headline">¶</a></h2>
 +<p>There is only one local admin user “owncloudadmin”, you can find his password in
 +<cite>/etc/owncloudadmin.secret</cite>. Use this account, if you want to change basic
 +ownCloud settings.</p>
 +<p>In the installation process a virtual host is set up (Apache is required
 +therefore). If you want to modify the settings, edit
 +<tt class="file docutils literal"><span class="pre">/etc/apache2/sites-available/owncloud</span></tt> and restart the web server. You
 +might want to do it to enable HTTPS connections. Besides that, you can edit the
 +<strong>.htaccess-File in /var/www/owncloud/</strong>. In the latter file there are also the
 +PHP limits for file transfer specified.</p>
 +</div>
 +<div class="section" id="using-owncloud">
 +<h2>Using ownCloud<a class="headerlink" href="#using-owncloud" title="Permalink to this headline">¶</a></h2>
 +<p>If you decided to enable every user by default to use ownCloud, simply
 +open up <a class="reference external" href="http://myserver.com/owncloud/">http://myserver.com/owncloud/</a> and log in with your LDAP
 +credentials and enjoy.</p>
 +<p>If you did not, go to the UMC and enable the users who shall have access
 +(see picture below). Then, login at <a class="reference external" href="http://myserver.com/owncloud/">http://myserver.com/owncloud/</a> with
 +your LDAP credentials.</p>
 +<img alt="../_images/ucsint1.png" src="../_images/ucsint1.png" />
 +<p>Updating users can also be done by the script
 +<tt class="file docutils literal"><span class="pre">/usr/share/owncloud/update-users.sh</span></tt> . It takes the following UCR
 +variables as parameters: <strong>owncloud/user/enabled</strong> for enabling or disabling,
 +<strong>owncloud/user/quota</strong> as the Quota value and <strong>owncloud/join/users/filter</strong> as
 +LDAP filter to select the users to update.</p>
 +<div class="section" id="groups-2012-4-0-4">
 +<h3>Groups 2012.4.0.4<a class="headerlink" href="#groups-2012-4-0-4" title="Permalink to this headline">¶</a></h3>
 +<p>Since ownCloud Enterprise 2012.4.0.4 group support is enabled. Groups,
 +that are activated for ownCloud usage, can be used to share files to
 +instead of single users, for example. It is also important to note, that
 +users can only share within groups where they belong to. Groups can be
 +enabled and disabled via UCM as shown in the screen shot below.</p>
 +<img alt="../_images/ucsint.png" src="../_images/ucsint.png" />
 +<p>Another way to enable or disable groups is to use the script
 +<tt class="file docutils literal"><span class="pre">/usr/share/owncloud/update-groups.sh</span></tt>. Currently, it takes an argument
 +which can be 1=enable groups or 0=disable groups. The filter applied is being
 +taken from the UCR variable <strong>owncloud/join/groups/filter</strong>. In case it is
 +empty, a message will be displayed.</p>
 +</div>
 +</div>
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/installation/installation_windows.html
index 495f383,0000000..74abfa1
mode 100644,000000..100644
--- a/core/doc/admin/installation/installation_windows.html
+++ b/core/doc/admin/installation/installation_windows.html
@@@ -1,429 -1,0 +1,432 @@@
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>Windows 7 and Windows Server 2008 — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '../',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="../_static/jquery.js"></script>
 +    <script type="text/javascript" src="../_static/underscore.js"></script>
 +    <script type="text/javascript" src="../_static/doctools.js"></script>
 +    <script type="text/javascript" src="../_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
 +    <link rel="up" title="Installation" href="index.html" />
 +    <link rel="next" title="Univention Corporate Server" href="installation_ucs.html" />
 +    <link rel="prev" title="Mac OS X" href="installation_macos.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="../contents.html">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
 +<ul class="current">
 +<li class="toctree-l1 current"><a class="reference internal" href="index.html">Installation</a><ul class="current">
 +<li class="toctree-l2"><a class="reference internal" href="installation_appliance.html">Appliances</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="installation_linux.html">Linux Distributions</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="installation_macos.html">Mac OS X</a></li>
 +<li class="toctree-l2 current"><a class="current reference internal" href="">Windows 7 and Windows Server 2008</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="#activate-iis-with-cgi-support">Activate IIS with CGI Support</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="#installing-php">Installing PHP</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="#installing-mysql">Installing MySQL</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="#installing-owncloud">Installing ownCloud</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="#ensure-proper-http-verb-handling">Ensure Proper HTTP-Verb handling</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="#configuring-owncloud-php-and-iis-for-large-file-uploads">Configuring ownCloud, PHP and IIS for Large File Uploads</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="installation_ucs.html">Univention Corporate Server</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="installation_source.html">Manual Installation</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="installation_others.html">PageKite Configuration</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="installation_others.html#open-wrt">Open Wrt</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../apps/index.html">Apps</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../sharing_api/index.html">Sharing API</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../config/index.html">The Configuration File</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <div class="section" id="windows-7-and-windows-server-2008">
 +<h1>Windows 7 and Windows Server 2008<a class="headerlink" href="#windows-7-and-windows-server-2008" title="Permalink to this headline">¶</a></h1>
 +<div class="admonition note">
 +<p class="first admonition-title">Note</p>
 +<p class="last">You must move the data directory outside of your public root (See
 +advanced install settings)</p>
 +</div>
 +<p>This section describes how to install ownCloud on Windows with <abbr title="Internet Information Services">IIS</abbr>.</p>
 +<p>It assumes that you have a vanilla, non-IIS enabled Windows
 +machine – Windows 7 or Server 2008. After enabling IIS, the steps are
 +essentially identical for Windows 7 and Windows Server 2008.</p>
 +<p>For installing ownCloud physical access or a remote desktop connection is
 +required. You should leverage MySQL as the backend database for ownCloud. If you
 +do not want to use MySQL, it is possible to use Postgres or SQLite instead.
 +Microsoft SQL Server is not yet support.</p>
 +<p>Enabling SSL is not yet covered by this section.</p>
 +<div class="admonition note">
 +<p class="first admonition-title">Note</p>
 +<p class="last">If you make your desktop machine or server available outside of your
 +LAN, you must maintain it. Monitor the logs, manage the access, apply patches to
 +avoid compromising the system at large.</p>
 +</div>
 +<p>There are 4 primary steps to the installation, and then a 5th step
 +required for configuring everything to allow files larger than the
 +default 2MB.</p>
 +<ol class="arabic simple">
 +<li>Install IIS with CGI support – enable IIS on your Windows machine.</li>
 +<li>Install PHP – Grab, download and install PHP.</li>
 +<li>Install MySQL – Setup the MySQL server manager and enable ownCloud to create
 +an instance.</li>
 +<li>Install ownCloud – The whole reason we are here!</li>
 +<li>Configure upload sizes and timeouts to enable large file uploads – So that
 +you can upload larger files.</li>
 +</ol>
 +<div class="section" id="activate-iis-with-cgi-support">
 +<h2>Activate IIS with CGI Support<a class="headerlink" href="#activate-iis-with-cgi-support" title="Permalink to this headline">¶</a></h2>
 +<div class="section" id="windows-7">
 +<h3>Windows 7<a class="headerlink" href="#windows-7" title="Permalink to this headline">¶</a></h3>
 +<ol class="arabic simple">
 +<li>Go to <em class="guilabel">Start –> Control Panel –> Programs</em>.</li>
 +<li>Under Programs and Features, there is link titled <em class="guilabel">Turn Windows Features on
 +and Off</em>. Click on it.</li>
 +<li>There is a box labeled Internet Information Services, expand it.</li>
 +<li>Expand World Wide Web Services and all the folders underneath.</li>
 +<li>Select the folders as illustrated in the picture below to get your IIS
 +server up and running.</li>
 +</ol>
 +<div class="align-center figure align-center">
 +<img alt="Windows features required for ownCloud on Windows 7" src="../_images/win7features.jpg" style="width: 250px;" />
 +<p class="caption">Windows Features required for ownCloud on Windows 7</p>
 +</div>
 +<p>You do not need an FTP server running, so you should tune
 +that feature off for your server. You definitely need the IIS Management
 +Console, as that is the easiest way to start, stop, restart you server,
 +as well as where you change certificate options and manage items like
 +file upload size. You must check the CGI box under Application
 +Development Features, because CGI is how you enable PHP on IIS.</p>
 +<p>You have to turn off WebDAV publishing or the Windows WebDAV
 +conflicts with the ownCloud WebDAV interface. This might already be
 +turned off for you, just make sure it stays that way. The common HTTP
 +features are the features you would expect from a web server.
 +With the selections on this page, IIS will now serve up a web page for you.</p>
 +<p>Restart IIS by going to the IIS manager (<em class="guilabel">Start –> IIS Manager</em>).</p>
 +<p>Select your website, and on the far right side is a section titled
 +<em class="guilabel">Manage Server</em>. Make sure that the service is started, or click
 +<em class="guilabel">Start</em> to start the services selected. Once this is complete, you
 +should be able to go to a web browser and navigate to <a class="reference external" href="http://localhost">http://localhost</a>.</p>
 +<p>This should open the standard IIS 7 splash page, which is just a static image
 +that says your web server is running. Assuming you were able to get the
 +splash page, it is safe to say your web server is now up and running.</p>
 +</div>
 +<div class="section" id="windows-server-2008">
 +<h3>Windows Server 2008<a class="headerlink" href="#windows-server-2008" title="Permalink to this headline">¶</a></h3>
 +<ol class="arabic simple">
 +<li>Go to <em class="guilabel">Start –> Control Panel –> Programs</em>.</li>
 +<li>Under Programs and Features, there is link titled
 +<em class="guilabel">Turn Windows Features on and Off</em>. Click on it.</li>
 +<li>This will bring up the Server Manager.</li>
 +<li>In the server manager, Click on Roles, and then click Add Roles.</li>
 +<li>Use the <em class="guilabel">Add Roles Wizard</em> to add the web server role.</li>
 +</ol>
 +<div class="align-center figure align-center">
 +<img alt="server roles required for ownCloud" src="../_images/winserverroles.jpg" style="width: 300px;" />
 +<p class="caption">Server roles required for ownCloud</p>
 +</div>
 +<ol class="arabic simple" start="6">
 +<li>Make sure that, at a minimum, the same boxes are checked in this wizard that
 +are checked in the Windows 7 Section. For example, make sure that the CGI box
 +is checked under Application Development Features, and that WebDAV Publishing
 +is turned off. With Remote Desktop Sharing turned on, the detailed role
 +service list looks like the figure “Role Services”.</li>
 +<li>Restart IIS by going to the IIS manager (<em class="guilabel">Start –> IIS Manager</em>).</li>
 +<li>Select your website, and on the far right side is a section titled Manage
 +server. Make sure that the service is started, or click “Start” to start the
 +services selected.</li>
 +<li>Once this is complete, you should be able to go to a web browser and type
 +<cite>localhost</cite>. This should open the standard IIS 7 splash page, which is just a
 +static image that says your web server is running.Assuming you were able to get
 +the splash page, it is safe to say your web server is now up and running. The
 +next part of this “how to” installs PHP on the server.</li>
 +</ol>
 +</div>
 +</div>
 +<div class="section" id="installing-php">
 +<h2>Installing PHP<a class="headerlink" href="#installing-php" title="Permalink to this headline">¶</a></h2>
 +<p>This part is also straightforward, but it is necessary to remind you that this
 +is for IIS only.</p>
 +<ol class="arabic simple">
 +<li>Go to the following link and grab the <a class="reference external" href="http://windows.php.net/download/">PHP installer</a> for version “VC9 Non Thread Safe” 32 or
 +64 bit based on your system.</li>
 +</ol>
 +<div class="admonition note">
 +<p class="first admonition-title">Note</p>
 +<p class="last">If you are using Apache, make sure you grab VC6 instead, lower on the page.</p>
 +</div>
 +<ol class="arabic simple" start="2">
 +<li>Once through that login, select the location that is closest to you
 +geographically.</li>
 +<li>Run that install wizard once it is downloaded. Read the license agreement,
 +agree, select an install directory.</li>
 +<li>Then select IIS FastCGI as the install server.</li>
 +<li>Take the default selections for the items to install, and click next.
 +Then click <cite>install</cite>.</li>
 +<li>After a few minutes, PHP will be installed. On to MySQL.</li>
 +</ol>
 +</div>
 +<div class="section" id="installing-mysql">
 +<h2>Installing MySQL<a class="headerlink" href="#installing-mysql" title="Permalink to this headline">¶</a></h2>
 +<p>This part installs MySQL on your Windows machine.</p>
 +<ol class="arabic simple">
 +<li>Point your browser to <a class="reference external" href="http://dev.mysql.com/downloads/">http://dev.mysql.com/downloads/</a> and download the latest
 +community edition for your OS – the 32 or 64 bit version. Please download the
 +<strong>MSI Installer</strong> as it will make life easier.</li>
 +<li>Once downloaded, install MySQL (5.5 at the time of writing). Select the
 +Typical installation.</li>
 +<li>When that finishes, check the box to launch the MySQL Instance Configuration
 +Wizard and click Finish.</li>
 +<li>Select a standard configuration, as this will be the only version of MySQL on
 +this machine.</li>
 +<li>Select to install as a windows service, and Check the Launch the MySQL Server
 +Automatically button.</li>
 +<li>Select the modify security settings box on the next page, and enter a
 +password you will remember. You will need this password when you configure
 +ownCloud.</li>
 +<li>Uncheck <strong>enable</strong> root access from remote machines” for security reasons.</li>
 +<li>Click execute, and wait while the instance is created and launched.</li>
 +<li>Click Finish when this is all complete.</li>
 +</ol>
 +<p>Take particular note of your MySQL password, as the user name <strong>root</strong>
 +and the password you select will be necessary later on in the ownCloud
 +installation. As an aside, this link is an excellent resource for questions on
 +how to configure your MySQL instance, and also to configure PHP to work with
 +MySQL. This, however, is not strictly necessary as much of this is handled when
 +you download ownCloud.</p>
 +<p>More information in this topic can be found in a <a class="reference external" href="http://learn.iis.net/page.aspx/353/install-and-configure-mysql-for-php-applications-on-iis-7-and-above/">tutorial on the IIS web site</a>.</p>
 +</div>
 +<div class="section" id="installing-owncloud">
 +<h2>Installing ownCloud<a class="headerlink" href="#installing-owncloud" title="Permalink to this headline">¶</a></h2>
 +<ol class="arabic simple">
 +<li>Download the latest version of ownCloud from <a class="reference external" href="http://owncloud.org/download">http://owncloud.org/download</a>.</li>
 +<li>It will arrive as a tar.bz2 file, and I recommend something like jZip for a
 +free utility to unzip it.</li>
 +<li>Once you have the ownCloud directory unzipped and saved locally, copy it into
 +your wwwroot directory (probably <strong>C:\inetpub\wwwroot</strong>).</li>
 +</ol>
 +<div class="admonition note">
 +<p class="first admonition-title">Note</p>
 +<p class="last">You cannot install directly into the directory <strong>wwwroot</strong> from jzip,
 +as only the administrator can unzip into the <strong>wwwroot</strong> directory. If you save
 +it in a different folder, and then move the files into <strong>wwwroot</strong> in windows
 +explorer, it works. This will install ownCloud locally in your root web
 +directory. You can use a subdirectory called owncloud, or whatever you want –
 +the www root, or something else.</p>
 +</div>
 +<ol class="arabic simple" start="4">
 +<li>It is now time to give write access to the ownCloud directory to the ownCloud
 +server: Navigate your windows explorer over to  <strong>inetpub/wwwroot/owncloud</strong> (or
 +your installation directory if you selected something different).</li>
 +<li>Right click and select properties. Click on the security tab, and click the
 +button “to change permissions, click edit”.</li>
 +<li>Select the “users” user from the list, and check the box “write”.</li>
 +<li>Apply these settings and close out.</li>
 +<li>Now open your browser and go to <a class="reference external" href="http://localhost/owncloud">http://localhost/owncloud</a> (or localhost if it
 +is installed in the root www directory). This should bring up the ownCloud
 +configuration page.</li>
 +<li>At this page, you enter your desired ownCloud user name and password for the
 +administrator, and expand the little arrow.</li>
 +<li>Select MySQL as the database, and enter your MySQL database user name,
 +password and desired instance name – use the user name and password you setup
 +for MySQL earlier in step 3, and pick any name for the database instance.</li>
 +</ol>
 +<div class="admonition note">
 +<p class="first admonition-title">Note</p>
 +<p class="last">The ownCloud admin password and the MySQL password CANNOT be the same
 +in any way.</p>
 +</div>
 +<ol class="arabic simple" start="11">
 +<li>Click next, and ownCloud should have you logged in as the admin user, and
 +you can get started exploring ownCloud, creating other users and more!</li>
 +</ol>
 +</div>
 +<div class="section" id="ensure-proper-http-verb-handling">
 +<h2>Ensure Proper HTTP-Verb handling<a class="headerlink" href="#ensure-proper-http-verb-handling" title="Permalink to this headline">¶</a></h2>
 +<p>IIS must pass all HTTP and WebDAV verbs to the PHP/CGI handler, and must not try
 +to handle them by itself. If it does, syncing with the Desktop and Mobile
 +Clients will fail. Here is how to ensure your configuration is correct:</p>
 +<ol class="arabic simple">
 +<li>Open IIS Manager7.</li>
 +<li>In the <cite>Connections</cite> bar, pick your site below <cite>Sites</cite>, or choose the top
 +level entry if you want to modify the machine-wide settings.</li>
 +<li>Choose the <cite>Handler Mappings</cite> feature click <cite>PHP_via_fastCGI</cite>.</li>
 +<li>Choose <cite>Request Restrictions</cite> and find the <cite>Verbs</cite> tab.</li>
 +<li>Ensure <cite>All Verbs</cite> is checked.</li>
 +<li>Click <cite>OK</cite>.</li>
 +<li>Next, choose <cite>Request Filtering</cite> feature from IIS Manager.</li>
 +<li>Ensure that all verbs are permitted (or none are forbidden) in the <cite>Verbs</cite>
 +tab.</li>
 +</ol>
 +<p>Also, ensure that you did not enable the WebDAV authoring module, since ownCloud
 +needs to be able to handle WebDAV on the application level.</p>
 +</div>
 +<div class="section" id="configuring-owncloud-php-and-iis-for-large-file-uploads">
 +<h2>Configuring ownCloud, PHP and IIS for Large File Uploads<a class="headerlink" href="#configuring-owncloud-php-and-iis-for-large-file-uploads" title="Permalink to this headline">¶</a></h2>
 +<p>Before going too nuts on ownCloud, it is important to do a couple of
 +configuration changes to make this a useful service for you. You will probably
 +want to increase the <strong>max upload size</strong>, for example. The default upload is
 +set to <strong>2MB</strong>, which is too small for even most MP3 files.</p>
 +<p>To do that, simply go into your <strong>PHP.ini</strong> file, which can be found in your
 +<strong>C:\Program Files (x86)\PHP</strong> folder. In here, you will find a <strong>PHP.ini</strong>
 +file. Open this in a text editor, and look for a few key attributes to
 +change:</p>
 +<ul class="simple">
 +<li><strong>upload_max_filesize</strong> – change this to something good, like 1G, and you
 +will get to upload much larger files.</li>
 +<li><strong>post_max_size</strong> – also change this size, and make it larger than the max
 +upload size you chose, like 1G.</li>
 +</ul>
 +<p>There are other changes you can make, such as the timeout duration for
 +uploads, but for now you should be all set in the <strong>PHP.ini</strong> file.</p>
 +<p>Now you have to go back to IIS manager and make one last change to enable file
 +uploads on the web server larger than 30MB.</p>
 +<ol class="arabic">
 +<li><p class="first">Go to the start menu, and type <strong>iis manager</strong>.</p>
 +</li>
 +<li><p class="first">Open IIS Manager Select the website you want enable to accept large file
 +uploads.</p>
 +</li>
 +<li><p class="first">In the main window in the middle double click on the icon <strong>Request
 +filtering</strong>.</p>
 +</li>
 +<li><p class="first">Once the window is opened you will see a bunch of tabs across the top of the
 +far right,</p>
 +<p>Select <em class="guilabel">Edit Feature Settings</em> and modify the <em class="guilabel">Maximum
 +allowed content length (bytes)</em></p>
 +</li>
 +<li><p class="first">In here, you can change this to up to 4.1 GB.</p>
 +</li>
 +</ol>
 +<div class="admonition note">
 +<p class="first admonition-title">Note</p>
 +<p class="last">This entry is in BYTES, not KB.</p>
 +</div>
 +<p>You should now have ownCloud configured and ready for use.</p>
 +</div>
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/issues/index.html
index 6ed03a6,0000000..bb3a2ef
mode 100644,000000..100644
--- a/core/doc/admin/issues/index.html
+++ b/core/doc/admin/issues/index.html
@@@ -1,163 -1,0 +1,166 @@@
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>Issues — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '../',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="../_static/jquery.js"></script>
 +    <script type="text/javascript" src="../_static/underscore.js"></script>
 +    <script type="text/javascript" src="../_static/doctools.js"></script>
 +    <script type="text/javascript" src="../_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
 +    <link rel="prev" title="Miscellaneous" href="../config/miscellaneous.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="../contents.html">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
 +<ul class="current">
 +<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../apps/index.html">Apps</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../sharing_api/index.html">Sharing API</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../config/index.html">The Configuration File</a></li>
 +<li class="toctree-l1 current"><a class="current reference internal" href="">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <div class="section" id="issues">
 +<h1>Issues<a class="headerlink" href="#issues" title="Permalink to this headline">¶</a></h1>
 +<p>If you think you have found a bug in ownCloud, please:</p>
 +<ul class="simple">
 +<li>Search for a solution</li>
 +<li>Double check your configuration</li>
 +</ul>
 +<p>If you can’t find a solution, please file an issue:</p>
 +<ul class="simple">
 +<li>If the issue is with the ownCloud server, report it to the <a class="reference external" href="https://github.com/owncloud/core">GitHub core repository</a></li>
 +<li>If the issue is with the ownCloud client, report it to the <a class="reference external" href="https://github.com/owncloud/mirall">GitHub mirall repository</a></li>
 +<li>If the issue with with an ownCloud app, report it to where that app is developed<ul>
 +<li>If the app is listed <a class="reference external" href="https://github.com/owncloud">here</a> report it to the correct repository</li>
 +<li>If the app is listed <a class="reference external" href="https://github.com/owncloud/apps">here</a> report it to the apps repository</li>
 +</ul>
 +</li>
 +</ul>
 +<p>Please note that the mailing list should not be used for bug reports, as it is hard to track them there.</p>
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/maintenance/backup.html
index d0b7e94,0000000..42485d6
mode 100644,000000..100644
--- a/core/doc/admin/maintenance/backup.html
+++ b/core/doc/admin/maintenance/backup.html
@@@ -1,191 -1,0 +1,194 @@@
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>Backing up ownCloud — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '../',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="../_static/jquery.js"></script>
 +    <script type="text/javascript" src="../_static/underscore.js"></script>
 +    <script type="text/javascript" src="../_static/doctools.js"></script>
 +    <script type="text/javascript" src="../_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
 +    <link rel="up" title="Maintenance" href="index.html" />
 +    <link rel="next" title="Updating ownCloud" href="update.html" />
 +    <link rel="prev" title="Maintenance" href="index.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="../contents.html">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
 +<ul class="current">
 +<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../apps/index.html">Apps</a></li>
 +<li class="toctree-l1 current"><a class="reference internal" href="index.html">Maintenance</a><ul class="current">
 +<li class="toctree-l2 current"><a class="current reference internal" href="">Backing up ownCloud</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="#backup-folders">Backup Folders</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="#backup-database">Backup Database</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="update.html">Updating ownCloud</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="restore.html">Restoring ownCloud</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="migrating.html">Migrating ownCloud Installations</a></li>
 +</ul>
 +</li>
++<li class="toctree-l1"><a class="reference internal" href="../cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../sharing_api/index.html">Sharing API</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../config/index.html">The Configuration File</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <div class="section" id="backing-up-owncloud">
 +<h1>Backing up ownCloud<a class="headerlink" href="#backing-up-owncloud" title="Permalink to this headline">¶</a></h1>
 +<p>To backup an ownCloud installation there are three main things you need to retain:</p>
 +<ol class="arabic simple">
 +<li>The config folder</li>
 +<li>The data folder</li>
 +<li>The database</li>
 +</ol>
 +<div class="section" id="backup-folders">
 +<h2>Backup Folders<a class="headerlink" href="#backup-folders" title="Permalink to this headline">¶</a></h2>
 +<p>Simply copy your config and data folder (or even your whole ownCloud install and data folder) to a place outside of
 +your ownCloud environment. You could use this command:</p>
 +<div class="highlight-python"><pre>rsync -Aax owncloud/ owncloud-dirbkp_`date +"%Y%m%d"`/</pre>
 +</div>
 +</div>
 +<div class="section" id="backup-database">
 +<h2>Backup Database<a class="headerlink" href="#backup-database" title="Permalink to this headline">¶</a></h2>
 +<div class="section" id="mysql">
 +<h3>MySQL<a class="headerlink" href="#mysql" title="Permalink to this headline">¶</a></h3>
 +<p>MySQL is the recommended database engine. To backup MySQL:</p>
 +<div class="highlight-python"><pre>mysqldump --lock-tables -h [server] -u [username] -p[password] > owncloud-sqlbkp_`date +"%Y%m%d"`.bak</pre>
 +</div>
 +</div>
 +<div class="section" id="sqlite">
 +<h3>SQLite<a class="headerlink" href="#sqlite" title="Permalink to this headline">¶</a></h3>
 +<div class="highlight-python"><pre>sqlite3 data/owncloud.db .dump > owncloud-sqlbkp_`date +"%Y%m%d"`.bak</pre>
 +</div>
 +</div>
 +<div class="section" id="postgresql">
 +<h3>PostgreSQL<a class="headerlink" href="#postgresql" title="Permalink to this headline">¶</a></h3>
 +<div class="highlight-python"><pre>PGPASSWORD="password" pg_dump owncloud -h [server] -U [username] -f owncloud-sqlbkp_`date +"%Y%m%d"`.bak</pre>
 +</div>
 +</div>
 +</div>
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/maintenance/index.html
index 1bb02fe,0000000..4fc062f
mode 100644,000000..100644
--- a/core/doc/admin/maintenance/index.html
+++ b/core/doc/admin/maintenance/index.html
@@@ -1,162 -1,0 +1,165 @@@
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>Maintenance — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '../',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="../_static/jquery.js"></script>
 +    <script type="text/javascript" src="../_static/underscore.js"></script>
 +    <script type="text/javascript" src="../_static/doctools.js"></script>
 +    <script type="text/javascript" src="../_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
 +    <link rel="next" title="Backing up ownCloud" href="backup.html" />
 +    <link rel="prev" title="File Viewers" href="../apps/viewers/index.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="../contents.html">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
 +<ul class="current">
 +<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../apps/index.html">Apps</a></li>
 +<li class="toctree-l1 current"><a class="current reference internal" href="">Maintenance</a><ul>
 +<li class="toctree-l2"><a class="reference internal" href="backup.html">Backing up ownCloud</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="update.html">Updating ownCloud</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="restore.html">Restoring ownCloud</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="migrating.html">Migrating ownCloud Installations</a></li>
 +</ul>
 +</li>
++<li class="toctree-l1"><a class="reference internal" href="../cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../sharing_api/index.html">Sharing API</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../config/index.html">The Configuration File</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <div class="section" id="maintenance">
 +<h1>Maintenance<a class="headerlink" href="#maintenance" title="Permalink to this headline">¶</a></h1>
 +<div class="toctree-wrapper compound">
 +<ul>
 +<li class="toctree-l1"><a class="reference internal" href="backup.html">Backing up ownCloud</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="update.html">Updating ownCloud</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="restore.html">Restoring ownCloud</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="migrating.html">Migrating ownCloud Installations</a></li>
 +</ul>
 +</div>
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/maintenance/migrating.html
index 5dd243e,0000000..0176f83
mode 100644,000000..100644
--- a/core/doc/admin/maintenance/migrating.html
+++ b/core/doc/admin/maintenance/migrating.html
@@@ -1,162 -1,0 +1,165 @@@
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>Migrating ownCloud Installations — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '../',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="../_static/jquery.js"></script>
 +    <script type="text/javascript" src="../_static/underscore.js"></script>
 +    <script type="text/javascript" src="../_static/doctools.js"></script>
 +    <script type="text/javascript" src="../_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
 +    <link rel="up" title="Maintenance" href="index.html" />
-     <link rel="next" title="The Configuration File" href="../config/index.html" />
++    <link rel="next" title="Driving Events with Cron" href="../cron/index.html" />
 +    <link rel="prev" title="Restoring ownCloud" href="restore.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="../contents.html">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
 +<ul class="current">
 +<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../apps/index.html">Apps</a></li>
 +<li class="toctree-l1 current"><a class="reference internal" href="index.html">Maintenance</a><ul class="current">
 +<li class="toctree-l2"><a class="reference internal" href="backup.html">Backing up ownCloud</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="update.html">Updating ownCloud</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="restore.html">Restoring ownCloud</a></li>
 +<li class="toctree-l2 current"><a class="current reference internal" href="">Migrating ownCloud Installations</a></li>
 +</ul>
 +</li>
++<li class="toctree-l1"><a class="reference internal" href="../cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../sharing_api/index.html">Sharing API</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../config/index.html">The Configuration File</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <div class="section" id="migrating-owncloud-installations">
 +<h1>Migrating ownCloud Installations<a class="headerlink" href="#migrating-owncloud-installations" title="Permalink to this headline">¶</a></h1>
 +<p>To migrate an ownCloud install, follow those steps:</p>
 +<ol class="arabic simple">
 +<li>Backup data/config folders and your database (look at “Backing Up ownCloud”)</li>
 +<li>Move your data</li>
 +<li>Restore your data/config folders and your database (look at “Restore ownCloud”)</li>
 +<li>Update config.php of any changes to your database connection</li>
 +</ol>
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/maintenance/restore.html
index 4a4b580,0000000..b25fc31
mode 100644,000000..100644
--- a/core/doc/admin/maintenance/restore.html
+++ b/core/doc/admin/maintenance/restore.html
@@@ -1,200 -1,0 +1,203 @@@
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>Restoring ownCloud — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '../',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="../_static/jquery.js"></script>
 +    <script type="text/javascript" src="../_static/underscore.js"></script>
 +    <script type="text/javascript" src="../_static/doctools.js"></script>
 +    <script type="text/javascript" src="../_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
 +    <link rel="up" title="Maintenance" href="index.html" />
 +    <link rel="next" title="Migrating ownCloud Installations" href="migrating.html" />
 +    <link rel="prev" title="Updating ownCloud" href="update.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="../contents.html">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
 +<ul class="current">
 +<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../apps/index.html">Apps</a></li>
 +<li class="toctree-l1 current"><a class="reference internal" href="index.html">Maintenance</a><ul class="current">
 +<li class="toctree-l2"><a class="reference internal" href="backup.html">Backing up ownCloud</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="update.html">Updating ownCloud</a></li>
 +<li class="toctree-l2 current"><a class="current reference internal" href="">Restoring ownCloud</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="#restore-folders">Restore Folders</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="#restore-database">Restore Database</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="migrating.html">Migrating ownCloud Installations</a></li>
 +</ul>
 +</li>
++<li class="toctree-l1"><a class="reference internal" href="../cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../sharing_api/index.html">Sharing API</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../config/index.html">The Configuration File</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <div class="section" id="restoring-owncloud">
 +<h1>Restoring ownCloud<a class="headerlink" href="#restoring-owncloud" title="Permalink to this headline">¶</a></h1>
 +<p>To restore an ownCloud installation there are three main things you need to restore:</p>
 +<ol class="arabic simple">
 +<li>The config folder</li>
 +<li>The data folder</li>
 +<li>The database</li>
 +</ol>
 +<div class="section" id="restore-folders">
 +<h2>Restore Folders<a class="headerlink" href="#restore-folders" title="Permalink to this headline">¶</a></h2>
 +<div class="admonition note">
 +<p class="first admonition-title">Note</p>
 +<p class="last">This guide assumes that your previous backup is called “owncloud-dirbkp”</p>
 +</div>
 +<p>Simply copy your config and data folder (or even your whole ownCloud install and data folder) to a place outside of
 +your ownCloud environment. You could use this command:</p>
 +<div class="highlight-python"><pre>rsync -Aax owncloud-dirbkp/ owncloud/</pre>
 +</div>
 +</div>
 +<div class="section" id="restore-database">
 +<h2>Restore Database<a class="headerlink" href="#restore-database" title="Permalink to this headline">¶</a></h2>
 +<div class="admonition note">
 +<p class="first admonition-title">Note</p>
 +<p class="last">This guide assumes that your previous backup is called “owncloud-sqlbkp.bak”</p>
 +</div>
 +<div class="section" id="mysql">
 +<h3>MySQL<a class="headerlink" href="#mysql" title="Permalink to this headline">¶</a></h3>
 +<p>MySQL is the recommended database engine. To backup MySQL:</p>
 +<div class="highlight-python"><div class="highlight"><pre><span class="n">mysql</span> <span class="o">-</span><span class="n">h</span> <span class="p">[</span><span class="n">server</span><span class="p">]</span> <span class="o">-</span><span class="n">u</span> <span class="p">[</span><span class="n">username</span><span class="p">]</span> <span class="o">-</span><span class="n">p</span><span class="p">[</span><span class="n">password</span><span class="p">]</span> <span class="o">< [...]
 +</pre></div>
 +</div>
 +</div>
 +<div class="section" id="sqlite">
 +<h3>SQLite<a class="headerlink" href="#sqlite" title="Permalink to this headline">¶</a></h3>
 +<div class="highlight-python"><pre>sqlite3 data/owncloud.db .dump < owncloud-sqlbkp.bak</pre>
 +</div>
 +</div>
 +<div class="section" id="postgresql">
 +<h3>PostgreSQL<a class="headerlink" href="#postgresql" title="Permalink to this headline">¶</a></h3>
 +<div class="highlight-python"><pre>PGPASSWORD="password" pg_restore -c -d owncloud -h [server] -U [username] owncloud-sqlbkp.bak</pre>
 +</div>
 +</div>
 +</div>
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/maintenance/update.html
index 783a46f,0000000..80fe1ff
mode 100644,000000..100644
--- a/core/doc/admin/maintenance/update.html
+++ b/core/doc/admin/maintenance/update.html
@@@ -1,215 -1,0 +1,218 @@@
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>Updating ownCloud — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '../',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="../_static/jquery.js"></script>
 +    <script type="text/javascript" src="../_static/underscore.js"></script>
 +    <script type="text/javascript" src="../_static/doctools.js"></script>
 +    <script type="text/javascript" src="../_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
 +    <link rel="up" title="Maintenance" href="index.html" />
 +    <link rel="next" title="Restoring ownCloud" href="restore.html" />
 +    <link rel="prev" title="Backing up ownCloud" href="backup.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="../contents.html">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
 +<ul class="current">
 +<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../apps/index.html">Apps</a></li>
 +<li class="toctree-l1 current"><a class="reference internal" href="index.html">Maintenance</a><ul class="current">
 +<li class="toctree-l2"><a class="reference internal" href="backup.html">Backing up ownCloud</a></li>
 +<li class="toctree-l2 current"><a class="current reference internal" href="">Updating ownCloud</a><ul>
 +<li class="toctree-l3"><a class="reference internal" href="#update">Update</a></li>
 +<li class="toctree-l3"><a class="reference internal" href="#upgrade">Upgrade</a></li>
 +</ul>
 +</li>
 +<li class="toctree-l2"><a class="reference internal" href="restore.html">Restoring ownCloud</a></li>
 +<li class="toctree-l2"><a class="reference internal" href="migrating.html">Migrating ownCloud Installations</a></li>
 +</ul>
 +</li>
++<li class="toctree-l1"><a class="reference internal" href="../cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../sharing_api/index.html">Sharing API</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../config/index.html">The Configuration File</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <div class="section" id="updating-owncloud">
 +<h1>Updating ownCloud<a class="headerlink" href="#updating-owncloud" title="Permalink to this headline">¶</a></h1>
 +<div class="admonition note">
 +<p class="first admonition-title">Note</p>
 +<p class="last">If you have installed ownCloud from a repository, your package management should take care of it. Probably
 +you will need to look for compatible third party applications yourself. <strong>Always do backups anyway.</strong></p>
 +</div>
 +<div class="section" id="update">
 +<h2>Update<a class="headerlink" href="#update" title="Permalink to this headline">¶</a></h2>
 +<p>Updating means updating ownCloud to the latest <em>point release</em>, e.g. ownCloud 6.0.0a → 6.0.2. This procedure uses the
 +ownCloud updater plugin called “Updater”: it’s an internal application already present in your ownCloud installation.</p>
 +<p>To update ownCloud, follow those steps:</p>
 +<ol class="arabic simple">
 +<li>Make a backup of the ownCloud folder and the database.</li>
 +<li>Make sure that updater plugin is enabled.</li>
 +<li>Navigate to the ‘Admin’ page.</li>
 +<li>Click ‘Update’.</li>
 +<li>Refresh the page with Ctrl+F5.</li>
 +</ol>
 +<p>If this procedure doesn’t work (for example, ownCloud 5.0.10 doesn’t show new any new version) you could try to perform
 +a full upgrade to update to the latest point release (see below).</p>
 +</div>
 +<div class="section" id="upgrade">
 +<h2>Upgrade<a class="headerlink" href="#upgrade" title="Permalink to this headline">¶</a></h2>
 +<p>Upgrade is to bring an ownCloud instance to a new <em>major release</em>, e.g.
 +ownCloud 5.0.14a → 6.0.2. Always do backups anyway.</p>
 +<p>To upgrade ownCloud, follow those steps:</p>
 +<ol class="arabic">
 +<li><p class="first">Make sure that you ran the latest point release of the major ownCloud
 +version, e.g. 5.0.14a in the 5.0 series. If not, update to that version first
 +(see above).</p>
 +</li>
 +<li><p class="first">Make a backup of the ownCloud folder and the database.</p>
 +</li>
 +<li><p class="first">Download the latest version to the working directory:</p>
 +<div class="highlight-python"><pre>wget http://download.owncloud.org/community/owncloud-latest.tar.bz2</pre>
 +</div>
 +</li>
 +<li><p class="first">Deactivate all third party applications.</p>
 +</li>
 +<li><p class="first">Delete everything from your ownCloud installation directory, except data and
 +config.</p>
 +</li>
 +<li><p class="first">Unpack the release tarball in the ownCloud directory (or copy the
 +files thereto). Assuming that your installation directory is called ‘owncloud’ and that it’s inside your working
 +directory, you could execute this command:</p>
 +<div class="highlight-python"><pre>tar xfj owncloud-latest.tar.bz2</pre>
 +</div>
 +</li>
 +<li><p class="first">Set the permissions properly</p>
 +</li>
 +<li><p class="first">With the next page request the update procedures will run.</p>
 +</li>
 +<li><p class="first">If you had 3rd party applications, check if they provide versions compatible
 +with the new release. If so, install and enable them, update procedures will run if needed.</p>
 +</li>
 +</ol>
 +</div>
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/quota/index.html
index 9dcdc85,0000000..244ce82
mode 100644,000000..100644
--- a/core/doc/admin/quota/index.html
+++ b/core/doc/admin/quota/index.html
@@@ -1,218 -1,0 +1,239 @@@
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>Quota Calculation — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '../',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="../_static/jquery.js"></script>
 +    <script type="text/javascript" src="../_static/underscore.js"></script>
 +    <script type="text/javascript" src="../_static/doctools.js"></script>
 +    <script type="text/javascript" src="../_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
++    <link rel="next" title="Sharing API" href="../sharing_api/index.html" />
++    <link rel="prev" title="Driving Events with Cron" href="../cron/index.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="../contents.html">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
- <ul>
++<ul class="current">
 +<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../apps/index.html">Apps</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1 current"><a class="current reference internal" href="">Quota Calculation</a><ul>
++<li class="toctree-l2"><a class="reference internal" href="#introduction">Introduction</a></li>
++<li class="toctree-l2"><a class="reference internal" href="#checking-available-space">Checking available space</a></li>
++<li class="toctree-l2"><a class="reference internal" href="#sharing">Sharing</a><ul>
++<li class="toctree-l3"><a class="reference internal" href="#shared-files">Shared Files</a></li>
++<li class="toctree-l3"><a class="reference internal" href="#shared-directories">Shared Directories</a></li>
++<li class="toctree-l3"><a class="reference internal" href="#resharing">Resharing</a></li>
++<li class="toctree-l3"><a class="reference internal" href="#public-sharing-with-upload-permission">Public sharing with upload permission</a></li>
++<li class="toctree-l3"><a class="reference internal" href="#metadata-and-cache">Metadata and cache</a></li>
++<li class="toctree-l3"><a class="reference internal" href="#deleted-files">Deleted Files</a></li>
++<li class="toctree-l3"><a class="reference internal" href="#version-control">Version Control</a></li>
++<li class="toctree-l3"><a class="reference internal" href="#encryption">Encryption</a></li>
++<li class="toctree-l3"><a class="reference internal" href="#external-storage">External Storage</a></li>
++</ul>
++</li>
++</ul>
++</li>
++<li class="toctree-l1"><a class="reference internal" href="../sharing_api/index.html">Sharing API</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../config/index.html">The Configuration File</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <div class="section" id="quota-calculation">
 +<h1>Quota Calculation<a class="headerlink" href="#quota-calculation" title="Permalink to this headline">¶</a></h1>
 +<div class="section" id="introduction">
 +<h2>Introduction<a class="headerlink" href="#introduction" title="Permalink to this headline">¶</a></h2>
 +<p>ownCloud allows the admin to specify a storage quota for users.
 +This quota is the maximum space a user is allowed to utilize for files located in their home storage.</p>
 +<p>The users quota is set in the Users page within ownCloud when creating a user.</p>
 +<p><img alt="10000000000003DF000000D953A456B6_png" src="../_images/10000000000003DF000000D953A456B6.png" style="width: 6.5in; height: 1.4228in;" /></p>
 +<p>Each user can have a different quota (shown above in the Storage column).
 +In addition, there is a default quota should a user not have a quota specified.</p>
 +<p>It is important to note that when setting a quota, the administrator needs to be aware that it applies only to the actual files and not the metadata.
 +This means when allocating a quota, the admin should make sure at least 10% more space is available for each user.</p>
 +</div>
 +<div class="section" id="checking-available-space">
 +<h2>Checking available space<a class="headerlink" href="#checking-available-space" title="Permalink to this headline">¶</a></h2>
 +<p>A user can check their available space on the Personal page.</p>
 +<p><img alt="10000000000003A800000039364066E4_png" src="../_images/10000000000003A800000039364066E4.png" style="width: 6.5in; height: 0.3957in;" /></p>
 +<p>The available space for a given user is calculated using the following formula:</p>
 +<p><img alt="10000000000002BB000000266DB6AD1A_png" src="../_images/10000000000002BB000000266DB6AD1A.png" style="width: 6.5in; height: 0.3535in;" /></p>
 +<p>Where disk_free_space is the space available on the partition where the user’s home storage is located on the server.</p>
 +</div>
 +<div class="section" id="sharing">
 +<h2>Sharing<a class="headerlink" href="#sharing" title="Permalink to this headline">¶</a></h2>
 +<p>Shared files or directories are counted against the owner’s quota and not the “shared-to” user’s quota.</p>
 +<div class="section" id="shared-files">
 +<h3>Shared Files<a class="headerlink" href="#shared-files" title="Permalink to this headline">¶</a></h3>
 +<p>When user A shares a file with user B, the size of the file will be counted against user A’s quota.
 +This is the case even if the file is modified by user B or if user B increases the file size.</p>
 +</div>
 +<div class="section" id="shared-directories">
 +<h3>Shared Directories<a class="headerlink" href="#shared-directories" title="Permalink to this headline">¶</a></h3>
 +<p>When user A shares a directory with User B, all files uploaded to that directory by user B will count against user A’s quota.
 +Likewise, files within that directory which are modified by user B will count against user A’s quota.</p>
 +</div>
 +<div class="section" id="resharing">
 +<h3>Resharing<a class="headerlink" href="#resharing" title="Permalink to this headline">¶</a></h3>
 +<p>If user A shares a file with user B who then reshares a file to user C, the space occupied by that file is counted against user A’s quota.</p>
 +</div>
 +<div class="section" id="public-sharing-with-upload-permission">
 +<h3>Public sharing with upload permission<a class="headerlink" href="#public-sharing-with-upload-permission" title="Permalink to this headline">¶</a></h3>
 +<p>If user A publicly shares a directory via a link and enables “public upload” permission, files uploaded to that directory from the outside are counted against user A’s quota.
 +Excluded from quota
 +===================</p>
 +<p>The following sections describe information which is not counted in a user’s quota.</p>
 +</div>
 +<div class="section" id="metadata-and-cache">
 +<h3>Metadata and cache<a class="headerlink" href="#metadata-and-cache" title="Permalink to this headline">¶</a></h3>
 +<p>Application metadata and cached information are excluded from total used space.
 +Examples of such data are thumbnails (icon previews, pictures app), temporary files, and encryption keys.</p>
 +</div>
 +<div class="section" id="deleted-files">
 +<h3>Deleted Files<a class="headerlink" href="#deleted-files" title="Permalink to this headline">¶</a></h3>
 +<p>Files which have been moved to the trash bin do not count against a user’s quota.
 +Deleted items are permanently deleted, oldest to newest, should the user run out of space to make room for new files.</p>
 +<p>For example, if the user has a 10GB quota, and has used 4GB of space and 5GB in the trash bin, the user will still have 6GB available space.
 +If, however, the user uploads 6GB, ownCloud will permanently delete files from the trash bin in order to make room for the new files.</p>
 +</div>
 +<div class="section" id="version-control">
 +<h3>Version Control<a class="headerlink" href="#version-control" title="Permalink to this headline">¶</a></h3>
 +<p>Older versions do not count against the user’s quota.
 +The versions app will delete old versions, oldest to newest, should the user run out of space to make room for new files.</p>
 +<p>For example, if the user has a 10GB quota, and has used 4GB and 5GB is used on older versions, the user will still have 6GB available space.
 +If, however, the user uploads 6GB, ownCloud will discard older versions to make room for the new files.</p>
 +</div>
 +<div class="section" id="encryption">
 +<h3>Encryption<a class="headerlink" href="#encryption" title="Permalink to this headline">¶</a></h3>
 +<p>Encrypted files are slightly larger than their unencrypted equivalents.
 +The unencrypted file size is used to determine the quota.</p>
 +</div>
 +<div class="section" id="external-storage">
 +<h3>External Storage<a class="headerlink" href="#external-storage" title="Permalink to this headline">¶</a></h3>
 +<p>External storage, mounted by either a user or the admin, is not taken into consideration when calculating the user’s storage.</p>
 +</div>
 +</div>
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/search.html
index 2cad2bb,0000000..e02a8d4
mode 100644,000000..100644
--- a/core/doc/admin/search.html
+++ b/core/doc/admin/search.html
@@@ -1,171 -1,0 +1,174 @@@
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>Search — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="_static/jquery.js"></script>
 +    <script type="text/javascript" src="_static/underscore.js"></script>
 +    <script type="text/javascript" src="_static/doctools.js"></script>
 +    <script type="text/javascript" src="_static/searchtools.js"></script>
 +    <script type="text/javascript" src="_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="index.html" />
 +  <script type="text/javascript">
 +    jQuery(function() { Search.loadIndex("searchindex.js"); });
 +  </script>
 +  
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="contents.html">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
 +<ul>
 +<li class="toctree-l1"><a class="reference internal" href="installation/index.html">Installation</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="configuration/index.html">Configuration</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="apps/index.html">Apps</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1"><a class="reference internal" href="quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="sharing_api/index.html">Sharing API</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="config/index.html">The Configuration File</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <h1 id="search-documentation">Search</h1>
 +  <div id="fallback" class="admonition warning">
 +  <script type="text/javascript">$('#fallback').hide();</script>
 +  <p>
 +    Please activate JavaScript to enable the search
 +    functionality.
 +  </p>
 +  </div>
 +  <p>
 +    From here you can search these documents. Enter your search
 +    words into the box below and click "search". Note that the search
 +    function will automatically search for all of the words. Pages
 +    containing fewer words won't appear in the result list.
 +  </p>
 +  <form action="" method="get">
 +    <input type="text" name="q" value="" />
 +    <input type="submit" value="search" />
 +    <span id="search-progress" style="padding-left: 10px"></span>
 +  </form>
 +  
 +  <div id="search-results">
 +  
 +  </div>
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/sharing_api/create_a_new_share.html
index 914df78,0000000..76a84ed
mode 100644,000000..100644
--- a/core/doc/admin/sharing_api/create_a_new_share.html
+++ b/core/doc/admin/sharing_api/create_a_new_share.html
@@@ -1,404 -1,0 +1,426 @@@
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>Create a new Share — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '../',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="../_static/jquery.js"></script>
 +    <script type="text/javascript" src="../_static/underscore.js"></script>
 +    <script type="text/javascript" src="../_static/doctools.js"></script>
 +    <script type="text/javascript" src="../_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
++    <link rel="up" title="Sharing API" href="index.html" />
++    <link rel="next" title="Delete Share" href="delete_share.html" />
++    <link rel="prev" title="Get Information about a known share" href="get_information_about_a_known_share.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="../contents.html">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
- <ul>
++<ul class="current">
 +<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../apps/index.html">Apps</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1 current"><a class="reference internal" href="index.html">Sharing API</a><ul class="current">
++<li class="toctree-l2"><a class="reference internal" href="get_all_shares.html">Get All Shares</a></li>
++<li class="toctree-l2"><a class="reference internal" href="get_shares_from_a_specific_file_or_folder.html">Get Shares from a Specific File or Folder</a></li>
++<li class="toctree-l2"><a class="reference internal" href="get_information_about_a_known_share.html">Get Information about a known share</a></li>
++<li class="toctree-l2 current"><a class="current reference internal" href="">Create a new Share</a><ul>
++<li class="toctree-l3"><a class="reference internal" href="#poster-share-as-a-link">Poster – Share as a link</a></li>
++<li class="toctree-l3"><a class="reference internal" href="#curl-share-as-link">Curl – Share as link</a></li>
++<li class="toctree-l3"><a class="reference internal" href="#output">Output</a></li>
++<li class="toctree-l3"><a class="reference internal" href="#poster-share-with-user">Poster – Share with user</a></li>
++<li class="toctree-l3"><a class="reference internal" href="#curl-share-with-user">Curl – Share with User</a></li>
++<li class="toctree-l3"><a class="reference internal" href="#id1">Output</a></li>
++</ul>
++</li>
++<li class="toctree-l2"><a class="reference internal" href="delete_share.html">Delete Share</a></li>
++<li class="toctree-l2"><a class="reference internal" href="index.html#introduction">Introduction</a></li>
++</ul>
++</li>
 +<li class="toctree-l1"><a class="reference internal" href="../config/index.html">The Configuration File</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <div class="section" id="create-a-new-share">
 +<h1>Create a new Share<a class="headerlink" href="#create-a-new-share" title="Permalink to this headline">¶</a></h1>
 +<p>To create a new share the following may be used.
 +This allows sharing with a user or group or as a link.</p>
 +<table border="1" class="docutils">
 +<colgroup>
 +<col width="14%" />
 +<col width="32%" />
 +<col width="6%" />
 +<col width="48%" />
 +</colgroup>
 +<tbody valign="top">
 +<tr class="row-odd"><td>Syntax</td>
 +<td><Base URL></td>
 +<td> </td>
 +<td> </td>
 +</tr>
 +<tr class="row-even"><td>Method</td>
 +<td>POST</td>
 +<td> </td>
 +<td> </td>
 +</tr>
 +<tr class="row-odd"><td>Mandatory Argument</td>
 +<td>path</td>
 +<td>string</td>
 +<td>Full path of the file/folder being shared</td>
 +</tr>
 +<tr class="row-even"><td>Mandatory Argument</td>
 +<td>shareType</td>
 +<td>int</td>
 +<td>‘0’ = user, ‘1’ = group, ‘3’ = Public link</td>
 +</tr>
 +<tr class="row-odd"><td>Argument</td>
 +<td>shareWith</td>
 +<td>string</td>
 +<td>User/group ID with who the file should be shared.
 +This is mandatory for shareType of 0 or 1</td>
 +</tr>
 +<tr class="row-even"><td>Argument</td>
 +<td>publicUpload</td>
 +<td>boolean</td>
 +<td><p class="first">If ‘false’ (default) public cannot upload to a public shared folder</p>
 +<p>If ‘true’ public can upload to a shared folder</p>
 +<p class="last">Only available for public link shares</p>
 +</td>
 +</tr>
 +<tr class="row-odd"><td>Argument</td>
 +<td>password</td>
 +<td>string</td>
 +<td><p class="first">Password to protect a public link share</p>
 +<p class="last">Only available for public link shares</p>
 +</td>
 +</tr>
 +<tr class="row-even"><td>Argument</td>
 +<td>permissions</td>
 +<td>int</td>
 +<td>From table in section 2.2 for user or group shares</td>
 +</tr>
 +<tr class="row-odd"><td>Result</td>
 +<td>XML Code with share ID of newly created share</td>
 +<td> </td>
 +<td> </td>
 +</tr>
 +</tbody>
 +</table>
 +<p>The following is a list of returned status codes:</p>
 +<table border="1" class="docutils">
 +<colgroup>
 +<col width="35%" />
 +<col width="65%" />
 +</colgroup>
 +<tbody valign="top">
 +<tr class="row-odd"><td>HTTP Status Code</td>
 +<td>Description</td>
 +</tr>
 +<tr class="row-even"><td>100</td>
 +<td>Successful</td>
 +</tr>
 +<tr class="row-odd"><td>400</td>
 +<td>Unknown Share type</td>
 +</tr>
 +<tr class="row-even"><td>403</td>
 +<td>Public Upload disabled by admin</td>
 +</tr>
 +<tr class="row-odd"><td>404</td>
 +<td>File couldn’t be shared</td>
 +</tr>
 +</tbody>
 +</table>
 +<div class="section" id="poster-share-as-a-link">
 +<h2>Poster – Share as a link<a class="headerlink" href="#poster-share-as-a-link" title="Permalink to this headline">¶</a></h2>
 +<p>The following example shares the file “test/Lab.txt” as a public link</p>
 +<table border="1" class="docutils">
 +<colgroup>
 +<col width="25%" />
 +<col width="75%" />
 +</colgroup>
 +<tbody valign="top">
 +<tr class="row-odd"><td>Field</td>
 +<td>Value</td>
 +</tr>
 +<tr class="row-even"><td><strong>URL</strong></td>
 +<td>Base URL for the API of the ownCloud server</td>
 +</tr>
 +<tr class="row-odd"><td><strong>User Auth</strong></td>
 +<td>User ID of the file owner</td>
 +</tr>
 +<tr class="row-even"><td><strong>Password</strong></td>
 +<td>User’s Password</td>
 +</tr>
 +<tr class="row-odd"><td><strong>Name</strong></td>
 +<td>Argument being passed</td>
 +</tr>
 +<tr class="row-even"><td><strong>Value</strong></td>
 +<td>Full path of file/folder shared</td>
 +</tr>
 +</tbody>
 +</table>
 +<p><img alt="1000000000000298000001874D3CA506_png" src="../_images/1000000000000298000001874D3CA506.png" style="width: 6.5in; height: 3.828in;" /></p>
 +<p>Navigate to the “Content to Send” tab and select “Body from Parameters”</p>
 +<p><img alt="1000000000000298000001870B0581FA_png" src="../_images/1000000000000298000001870B0581FA.png" style="width: 6.5in; height: 3.828in;" /></p>
 +<p>Select POST.</p>
 +</div>
 +<div class="section" id="curl-share-as-link">
 +<h2>Curl – Share as link<a class="headerlink" href="#curl-share-as-link" title="Permalink to this headline">¶</a></h2>
 +<p>$ curl http://<ip>/ocs/v1.php/apps/files_sharing/api/v1/shares -k -u user:password -X POST –data “path=<file>&shareType=3”</p>
 +</div>
 +<div class="section" id="output">
 +<h2>Output<a class="headerlink" href="#output" title="Permalink to this headline">¶</a></h2>
 +<table border="1" class="docutils">
 +<colgroup>
 +<col width="77%" />
 +<col width="23%" />
 +</colgroup>
 +<tbody valign="top">
 +<tr class="row-odd"><td><?xml version=”1.0”?></td>
 +<td> </td>
 +</tr>
 +<tr class="row-even"><td><ocs></td>
 +<td> </td>
 +</tr>
 +<tr class="row-odd"><td><meta></td>
 +<td> </td>
 +</tr>
 +<tr class="row-even"><td><status>ok</status></td>
 +<td> </td>
 +</tr>
 +<tr class="row-odd"><td><statuscode>100</statuscode></td>
 +<td>Status = 100: successful</td>
 +</tr>
 +<tr class="row-even"><td><message/></td>
 +<td> </td>
 +</tr>
 +<tr class="row-odd"><td></meta></td>
 +<td> </td>
 +</tr>
 +<tr class="row-even"><td><data></td>
 +<td> </td>
 +</tr>
 +<tr class="row-odd"><td><id>9</id></td>
 +<td>Share ID = 9</td>
 +</tr>
 +<tr class="row-even"><td><url>http://192.168.1.63/owncloud6RC3/public.php?service=files&amp;t=e1947aaeaa2b88a69cc1e90bf27ddfe2</url></td>
 +<td>Share Link.
 +Send this to the desired users</td>
 +</tr>
 +<tr class="row-odd"><td><token>e1947aaeaa2b88a69cc1e90bf27ddfe2</token></td>
 +<td> </td>
 +</tr>
 +<tr class="row-even"><td></data></td>
 +<td> </td>
 +</tr>
 +<tr class="row-odd"><td><strong></ocs></strong></td>
 +<td> </td>
 +</tr>
 +</tbody>
 +</table>
 +</div>
 +<div class="section" id="poster-share-with-user">
 +<h2>Poster – Share with user<a class="headerlink" href="#poster-share-with-user" title="Permalink to this headline">¶</a></h2>
 +<p>The following example shares a file called “test/Lab.txt” with user “ser72”</p>
 +<table border="1" class="docutils">
 +<colgroup>
 +<col width="25%" />
 +<col width="75%" />
 +</colgroup>
 +<tbody valign="top">
 +<tr class="row-odd"><td>Field</td>
 +<td>Value</td>
 +</tr>
 +<tr class="row-even"><td><strong>URL</strong></td>
 +<td>Base URL for the API of the ownCloud server</td>
 +</tr>
 +<tr class="row-odd"><td><strong>User Auth</strong></td>
 +<td>User ID of the file owner</td>
 +</tr>
 +<tr class="row-even"><td><strong>Password</strong></td>
 +<td>User’s Password</td>
 +</tr>
 +<tr class="row-odd"><td><strong>Name</strong></td>
 +<td>Argument being passed</td>
 +</tr>
 +<tr class="row-even"><td><strong>Value</strong></td>
 +<td>Full path of file/folder shared</td>
 +</tr>
 +</tbody>
 +</table>
 +<p><img alt="1000000000000289000001A9D7F3941F_png" src="../_images/1000000000000289000001A9D7F3941F.png" style="width: 6.5in; height: 4.2563in;" /></p>
 +<p>Navigate to the “Content to Send Tab” and select “Body from Parameters”</p>
 +<p><img alt="10000000000002950000019EF5732E36_png" src="../_images/10000000000002950000019EF5732E36.png" style="width: 6.5in; height: 4.0701in;" /></p>
 +<p>Select POST.</p>
 +</div>
 +<div class="section" id="curl-share-with-user">
 +<h2>Curl – Share with User<a class="headerlink" href="#curl-share-with-user" title="Permalink to this headline">¶</a></h2>
 +<p>$ curl http://<ip>/ocs/v1.php/apps/files_sharing/api/v1/shares -k -u user:password -X POST –data “path=<file>&shareType=0&shareWith=<user>”</p>
 +</div>
 +<div class="section" id="id1">
 +<h2>Output<a class="headerlink" href="#id1" title="Permalink to this headline">¶</a></h2>
 +<table border="1" class="docutils">
 +<colgroup>
 +<col width="55%" />
 +<col width="45%" />
 +</colgroup>
 +<tbody valign="top">
 +<tr class="row-odd"><td><?xml version=”1.0”?></td>
 +<td> </td>
 +</tr>
 +<tr class="row-even"><td><ocs></td>
 +<td> </td>
 +</tr>
 +<tr class="row-odd"><td><meta></td>
 +<td> </td>
 +</tr>
 +<tr class="row-even"><td><status>ok</status></td>
 +<td> </td>
 +</tr>
 +<tr class="row-odd"><td><statuscode>100</statuscode></td>
 +<td>Status: 100: Successful</td>
 +</tr>
 +<tr class="row-even"><td><message/></td>
 +<td> </td>
 +</tr>
 +<tr class="row-odd"><td></meta></td>
 +<td> </td>
 +</tr>
 +<tr class="row-even"><td><data></td>
 +<td> </td>
 +</tr>
 +<tr class="row-odd"><td><id>10</id></td>
 +<td>Share ID = 10</td>
 +</tr>
 +<tr class="row-even"><td></data></td>
 +<td> </td>
 +</tr>
 +<tr class="row-odd"><td></ocs></td>
 +<td> </td>
 +</tr>
 +</tbody>
 +</table>
 +</div>
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/sharing_api/delete_share.html
index 10dd551,0000000..5500b9b
mode 100644,000000..100644
--- a/core/doc/admin/sharing_api/delete_share.html
+++ b/core/doc/admin/sharing_api/delete_share.html
@@@ -1,231 -1,0 +1,250 @@@
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>Delete Share — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '../',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="../_static/jquery.js"></script>
 +    <script type="text/javascript" src="../_static/underscore.js"></script>
 +    <script type="text/javascript" src="../_static/doctools.js"></script>
 +    <script type="text/javascript" src="../_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
++    <link rel="up" title="Sharing API" href="index.html" />
++    <link rel="next" title="The Configuration File" href="../config/index.html" />
++    <link rel="prev" title="Create a new Share" href="create_a_new_share.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="../contents.html">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
- <ul>
++<ul class="current">
 +<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../apps/index.html">Apps</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1 current"><a class="reference internal" href="index.html">Sharing API</a><ul class="current">
++<li class="toctree-l2"><a class="reference internal" href="get_all_shares.html">Get All Shares</a></li>
++<li class="toctree-l2"><a class="reference internal" href="get_shares_from_a_specific_file_or_folder.html">Get Shares from a Specific File or Folder</a></li>
++<li class="toctree-l2"><a class="reference internal" href="get_information_about_a_known_share.html">Get Information about a known share</a></li>
++<li class="toctree-l2"><a class="reference internal" href="create_a_new_share.html">Create a new Share</a></li>
++<li class="toctree-l2 current"><a class="current reference internal" href="">Delete Share</a><ul>
++<li class="toctree-l3"><a class="reference internal" href="#poster">Poster</a></li>
++<li class="toctree-l3"><a class="reference internal" href="#curl">Curl</a></li>
++<li class="toctree-l3"><a class="reference internal" href="#output">Output</a></li>
++</ul>
++</li>
++<li class="toctree-l2"><a class="reference internal" href="index.html#introduction">Introduction</a></li>
++</ul>
++</li>
 +<li class="toctree-l1"><a class="reference internal" href="../config/index.html">The Configuration File</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <div class="section" id="delete-share">
 +<h1>Delete Share<a class="headerlink" href="#delete-share" title="Permalink to this headline">¶</a></h1>
 +<p>The following method should be used in the event that a file share should be removed.</p>
 +<p>Note: the share ID can be obtained from the output of any of the previous Share API calls or the creation of a new share.</p>
 +<table border="1" class="docutils">
 +<colgroup>
 +<col width="30%" />
 +<col width="70%" />
 +</colgroup>
 +<tbody valign="top">
 +<tr class="row-odd"><td>Syntax</td>
 +<td><Base URL>/<share id></td>
 +</tr>
 +<tr class="row-even"><td>Method</td>
 +<td>DELETE</td>
 +</tr>
 +<tr class="row-odd"><td>Argument</td>
 +<td>Share ID (int)</td>
 +</tr>
 +</tbody>
 +</table>
 +<p>The following is a list of returned status codes:</p>
 +<table border="1" class="docutils">
 +<colgroup>
 +<col width="41%" />
 +<col width="59%" />
 +</colgroup>
 +<tbody valign="top">
 +<tr class="row-odd"><td>HTTP Status Code</td>
 +<td>Description</td>
 +</tr>
 +<tr class="row-even"><td>100</td>
 +<td>Successful</td>
 +</tr>
 +<tr class="row-odd"><td>404</td>
 +<td>File couldn’t be deleted</td>
 +</tr>
 +</tbody>
 +</table>
 +<div class="section" id="poster">
 +<h2>Poster<a class="headerlink" href="#poster" title="Permalink to this headline">¶</a></h2>
 +<p>To remove the share identified by ID 10, use the following method.</p>
 +<p><img alt="10000000000002910000018B31D51F03_png" src="../_images/10000000000002910000018B31D51F03.png" style="width: 6.5in; height: 3.9075in;" /></p>
 +<p>Press DELETE</p>
 +</div>
 +<div class="section" id="curl">
 +<h2>Curl<a class="headerlink" href="#curl" title="Permalink to this headline">¶</a></h2>
 +<p>$ curl –X “DELETE” http://<user>:<password>@<ip>/ocs/v1.php/apps/files_sharing/api/v1/files/<share_id></p>
 +</div>
 +<div class="section" id="output">
 +<h2>Output<a class="headerlink" href="#output" title="Permalink to this headline">¶</a></h2>
 +<table border="1" class="docutils">
 +<colgroup>
 +<col width="56%" />
 +<col width="44%" />
 +</colgroup>
 +<tbody valign="top">
 +<tr class="row-odd"><td><?xml version=”1.0”?></td>
 +<td> </td>
 +</tr>
 +<tr class="row-even"><td><ocs></td>
 +<td> </td>
 +</tr>
 +<tr class="row-odd"><td><meta></td>
 +<td> </td>
 +</tr>
 +<tr class="row-even"><td><status>ok</status></td>
 +<td> </td>
 +</tr>
 +<tr class="row-odd"><td><statuscode>100</statuscode></td>
 +<td>Status=100: Successful</td>
 +</tr>
 +<tr class="row-even"><td><message/></td>
 +<td> </td>
 +</tr>
 +<tr class="row-odd"><td></meta></td>
 +<td> </td>
 +</tr>
 +<tr class="row-even"><td><data/></td>
 +<td> </td>
 +</tr>
 +<tr class="row-odd"><td></ocs></td>
 +<td> </td>
 +</tr>
 +</tbody>
 +</table>
 +</div>
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/sharing_api/get_all_shares.html
index 7f457e1,0000000..e07b406
mode 100644,000000..100644
--- a/core/doc/admin/sharing_api/get_all_shares.html
+++ b/core/doc/admin/sharing_api/get_all_shares.html
@@@ -1,305 -1,0 +1,324 @@@
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>Get All Shares — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '../',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="../_static/jquery.js"></script>
 +    <script type="text/javascript" src="../_static/underscore.js"></script>
 +    <script type="text/javascript" src="../_static/doctools.js"></script>
 +    <script type="text/javascript" src="../_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
++    <link rel="up" title="Sharing API" href="index.html" />
++    <link rel="next" title="Get Shares from a Specific File or Folder" href="get_shares_from_a_specific_file_or_folder.html" />
++    <link rel="prev" title="Sharing API" href="index.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="../contents.html">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
- <ul>
++<ul class="current">
 +<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../apps/index.html">Apps</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1 current"><a class="reference internal" href="index.html">Sharing API</a><ul class="current">
++<li class="toctree-l2 current"><a class="current reference internal" href="">Get All Shares</a><ul>
++<li class="toctree-l3"><a class="reference internal" href="#poster">Poster</a></li>
++<li class="toctree-l3"><a class="reference internal" href="#curl">Curl</a></li>
++<li class="toctree-l3"><a class="reference internal" href="#output">Output</a></li>
++</ul>
++</li>
++<li class="toctree-l2"><a class="reference internal" href="get_shares_from_a_specific_file_or_folder.html">Get Shares from a Specific File or Folder</a></li>
++<li class="toctree-l2"><a class="reference internal" href="get_information_about_a_known_share.html">Get Information about a known share</a></li>
++<li class="toctree-l2"><a class="reference internal" href="create_a_new_share.html">Create a new Share</a></li>
++<li class="toctree-l2"><a class="reference internal" href="delete_share.html">Delete Share</a></li>
++<li class="toctree-l2"><a class="reference internal" href="index.html#introduction">Introduction</a></li>
++</ul>
++</li>
 +<li class="toctree-l1"><a class="reference internal" href="../config/index.html">The Configuration File</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <div class="section" id="get-all-shares">
 +<h1>Get All Shares<a class="headerlink" href="#get-all-shares" title="Permalink to this headline">¶</a></h1>
 +<p>To obtain a list of all files shared by a user, the following can be used.</p>
 +<table border="1" class="docutils">
 +<colgroup>
 +<col width="17%" />
 +<col width="83%" />
 +</colgroup>
 +<tbody valign="top">
 +<tr class="row-odd"><td>Syntax</td>
 +<td><Base URL></td>
 +</tr>
 +<tr class="row-even"><td>Method</td>
 +<td>GET</td>
 +</tr>
 +<tr class="row-odd"><td>Result</td>
 +<td>XML code with all shares by the user</td>
 +</tr>
 +</tbody>
 +</table>
 +<p>The following is a list of returned status codes:</p>
 +<table border="1" class="docutils">
 +<colgroup>
 +<col width="46%" />
 +<col width="54%" />
 +</colgroup>
 +<tbody valign="top">
 +<tr class="row-odd"><td>HTTP Status Code</td>
 +<td>Description</td>
 +</tr>
 +<tr class="row-even"><td>100</td>
 +<td>Successful</td>
 +</tr>
 +<tr class="row-odd"><td>404</td>
 +<td>Couldn’t get shares</td>
 +</tr>
 +</tbody>
 +</table>
 +<div class="section" id="poster">
 +<h2>Poster<a class="headerlink" href="#poster" title="Permalink to this headline">¶</a></h2>
 +<table border="1" class="docutils">
 +<colgroup>
 +<col width="25%" />
 +<col width="75%" />
 +</colgroup>
 +<tbody valign="top">
 +<tr class="row-odd"><td>Field</td>
 +<td>Value</td>
 +</tr>
 +<tr class="row-even"><td><strong>URL</strong></td>
 +<td>Base URL for the API of the ownCloud server</td>
 +</tr>
 +<tr class="row-odd"><td><strong>User Auth</strong></td>
 +<td>User ID performing the Share</td>
 +</tr>
 +<tr class="row-even"><td><strong>Password</strong></td>
 +<td>User’s Password</td>
 +</tr>
 +</tbody>
 +</table>
 +<p><img alt="10000201000002FC000001DC2DDAD2F1_png" src="../_images/10000201000002FC000001DC2DDAD2F1.png" /></p>
 +<p>Select “GET”</p>
 +</div>
 +<div class="section" id="curl">
 +<h2>Curl<a class="headerlink" href="#curl" title="Permalink to this headline">¶</a></h2>
 +<p>The user is the id of the user who shares the files.
 +The password belongs to that user as well.</p>
 +<p>$ curl http://<user>:<password>@<ip>/ocs/v1.php/apps/files_sharing/api/v1/shares</p>
 +</div>
 +<div class="section" id="output">
 +<h2>Output<a class="headerlink" href="#output" title="Permalink to this headline">¶</a></h2>
 +<table border="1" class="docutils">
 +<colgroup>
 +<col width="55%" />
 +<col width="45%" />
 +</colgroup>
 +<tbody valign="top">
 +<tr class="row-odd"><td><?xml version=”1.0”?></td>
 +<td> </td>
 +</tr>
 +<tr class="row-even"><td><ocs></td>
 +<td> </td>
 +</tr>
 +<tr class="row-odd"><td><meta></td>
 +<td> </td>
 +</tr>
 +<tr class="row-even"><td><status>ok</status></td>
 +<td> </td>
 +</tr>
 +<tr class="row-odd"><td><statuscode>100</statuscode></td>
 +<td>Status = 100: Successful</td>
 +</tr>
 +<tr class="row-even"><td><message/></td>
 +<td> </td>
 +</tr>
 +<tr class="row-odd"><td></meta></td>
 +<td> </td>
 +</tr>
 +<tr class="row-even"><td><data></td>
 +<td> </td>
 +</tr>
 +<tr class="row-odd"><td><element></td>
 +<td> </td>
 +</tr>
 +<tr class="row-even"><td><id>6</id></td>
 +<td>Share ID = 6</td>
 +</tr>
 +<tr class="row-odd"><td><item_type>file</item_type></td>
 +<td> </td>
 +</tr>
 +<tr class="row-even"><td><item_source>138</item_source></td>
 +<td> </td>
 +</tr>
 +<tr class="row-odd"><td><parent/></td>
 +<td> </td>
 +</tr>
 +<tr class="row-even"><td><share_type>0</share_type></td>
 +<td>Share Type = 0: User share</td>
 +</tr>
 +<tr class="row-odd"><td><share_with>ser72</share_with></td>
 +<td>File shared with user ser72</td>
 +</tr>
 +<tr class="row-even"><td><file_source>138</file_source></td>
 +<td> </td>
 +</tr>
 +<tr class="row-odd"><td><path>/Lab.txt</path></td>
 +<td>File name /Lab.txt</td>
 +</tr>
 +<tr class="row-even"><td><permissions>27</permissions></td>
 +<td>Permissions: Re-share, Read, Delete, Update</td>
 +</tr>
 +<tr class="row-odd"><td><stime>1386697532</stime></td>
 +<td> </td>
 +</tr>
 +<tr class="row-even"><td><expiration/></td>
 +<td> </td>
 +</tr>
 +<tr class="row-odd"><td><token/></td>
 +<td> </td>
 +</tr>
 +<tr class="row-even"><td><storage>4</storage></td>
 +<td> </td>
 +</tr>
 +<tr class="row-odd"><td><mail_send>0</mail_send></td>
 +<td>Do not send email alerting of the share</td>
 +</tr>
 +<tr class="row-even"><td><share_with_displayname>ser72</share_with_displayname></td>
 +<td> </td>
 +</tr>
 +<tr class="row-odd"><td></element></td>
 +<td> </td>
 +</tr>
 +<tr class="row-even"><td></data></td>
 +<td> </td>
 +</tr>
 +<tr class="row-odd"><td></ocs></td>
 +<td> </td>
 +</tr>
 +</tbody>
 +</table>
 +</div>
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/sharing_api/get_information_about_a_known_share.html
index b502832,0000000..7d67cfd
mode 100644,000000..100644
--- a/core/doc/admin/sharing_api/get_information_about_a_known_share.html
+++ b/core/doc/admin/sharing_api/get_information_about_a_known_share.html
@@@ -1,310 -1,0 +1,329 @@@
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>Get Information about a known share — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '../',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="../_static/jquery.js"></script>
 +    <script type="text/javascript" src="../_static/underscore.js"></script>
 +    <script type="text/javascript" src="../_static/doctools.js"></script>
 +    <script type="text/javascript" src="../_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
++    <link rel="up" title="Sharing API" href="index.html" />
++    <link rel="next" title="Create a new Share" href="create_a_new_share.html" />
++    <link rel="prev" title="Get Shares from a Specific File or Folder" href="get_shares_from_a_specific_file_or_folder.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="../contents.html">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
- <ul>
++<ul class="current">
 +<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../apps/index.html">Apps</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1 current"><a class="reference internal" href="index.html">Sharing API</a><ul class="current">
++<li class="toctree-l2"><a class="reference internal" href="get_all_shares.html">Get All Shares</a></li>
++<li class="toctree-l2"><a class="reference internal" href="get_shares_from_a_specific_file_or_folder.html">Get Shares from a Specific File or Folder</a></li>
++<li class="toctree-l2 current"><a class="current reference internal" href="">Get Information about a known share</a><ul>
++<li class="toctree-l3"><a class="reference internal" href="#poster">Poster</a></li>
++<li class="toctree-l3"><a class="reference internal" href="#curl">Curl</a></li>
++<li class="toctree-l3"><a class="reference internal" href="#output">Output</a></li>
++</ul>
++</li>
++<li class="toctree-l2"><a class="reference internal" href="create_a_new_share.html">Create a new Share</a></li>
++<li class="toctree-l2"><a class="reference internal" href="delete_share.html">Delete Share</a></li>
++<li class="toctree-l2"><a class="reference internal" href="index.html#introduction">Introduction</a></li>
++</ul>
++</li>
 +<li class="toctree-l1"><a class="reference internal" href="../config/index.html">The Configuration File</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <div class="section" id="get-information-about-a-known-share">
 +<h1>Get Information about a known share<a class="headerlink" href="#get-information-about-a-known-share" title="Permalink to this headline">¶</a></h1>
 +<p>To get information about a share when the share ID is known, use the following.</p>
 +<p>Note: the share ID can be obtained from the output of any of the previous Share API calls or the creation of a new share.</p>
 +<table border="1" class="docutils">
 +<colgroup>
 +<col width="25%" />
 +<col width="75%" />
 +</colgroup>
 +<tbody valign="top">
 +<tr class="row-odd"><td>Syntax</td>
 +<td><Base URL>/<share id></td>
 +</tr>
 +<tr class="row-even"><td>Method</td>
 +<td>GET</td>
 +</tr>
 +<tr class="row-odd"><td>Arguments</td>
 +<td>Share id (int)</td>
 +</tr>
 +<tr class="row-even"><td>Result</td>
 +<td>XML code with share information</td>
 +</tr>
 +<tr class="row-odd"><td> </td>
 +<td> </td>
 +</tr>
 +</tbody>
 +</table>
 +<p>The following is a list of returned status codes:</p>
 +<table border="1" class="docutils">
 +<colgroup>
 +<col width="46%" />
 +<col width="54%" />
 +</colgroup>
 +<tbody valign="top">
 +<tr class="row-odd"><td>HTTP Status Code</td>
 +<td>Description</td>
 +</tr>
 +<tr class="row-even"><td>100</td>
 +<td>Successful</td>
 +</tr>
 +<tr class="row-odd"><td>404</td>
 +<td>Share doesn’t exist</td>
 +</tr>
 +</tbody>
 +</table>
 +<div class="section" id="poster">
 +<h2>Poster<a class="headerlink" href="#poster" title="Permalink to this headline">¶</a></h2>
 +<p>This example shows the output of share information for share ID “7”</p>
 +<table border="1" class="docutils">
 +<colgroup>
 +<col width="21%" />
 +<col width="79%" />
 +</colgroup>
 +<tbody valign="top">
 +<tr class="row-odd"><td>Field</td>
 +<td>Value</td>
 +</tr>
 +<tr class="row-even"><td><strong>URL</strong></td>
 +<td>Base URL for the API of the ownCloud server/<share id></td>
 +</tr>
 +<tr class="row-odd"><td><strong>User Auth</strong></td>
 +<td>User ID of the file owner</td>
 +</tr>
 +<tr class="row-even"><td><strong>Password</strong></td>
 +<td>User’s Password</td>
 +</tr>
 +</tbody>
 +</table>
 +<p><img alt="1000000000000288000001A1D5BE4881_png" src="../_images/1000000000000288000001A1D5BE4881.png" style="width: 6.5in; height: 4.1819in;" /></p>
 +</div>
 +<div class="section" id="curl">
 +<h2>Curl<a class="headerlink" href="#curl" title="Permalink to this headline">¶</a></h2>
 +<p>$ curl http://<user>:<passowrd>@<ip>/ocs/v1.php/apps/files_sharing/api/v1/shares/<share_id></p>
 +</div>
 +<div class="section" id="output">
 +<h2>Output<a class="headerlink" href="#output" title="Permalink to this headline">¶</a></h2>
 +<table border="1" class="docutils">
 +<colgroup>
 +<col width="70%" />
 +<col width="30%" />
 +</colgroup>
 +<tbody valign="top">
 +<tr class="row-odd"><td><?xml version=”1.0”?></td>
 +<td> </td>
 +</tr>
 +<tr class="row-even"><td><ocs></td>
 +<td> </td>
 +</tr>
 +<tr class="row-odd"><td><meta></td>
 +<td> </td>
 +</tr>
 +<tr class="row-even"><td><status>ok</status></td>
 +<td>Status=100: successful</td>
 +</tr>
 +<tr class="row-odd"><td><statuscode>100</statuscode></td>
 +<td> </td>
 +</tr>
 +<tr class="row-even"><td><message/></td>
 +<td> </td>
 +</tr>
 +<tr class="row-odd"><td></meta></td>
 +<td> </td>
 +</tr>
 +<tr class="row-even"><td><data></td>
 +<td> </td>
 +</tr>
 +<tr class="row-odd"><td><element></td>
 +<td> </td>
 +</tr>
 +<tr class="row-even"><td><id>7</id></td>
 +<td>Share ID = 7</td>
 +</tr>
 +<tr class="row-odd"><td><item_type>file</item_type></td>
 +<td> </td>
 +</tr>
 +<tr class="row-even"><td><item_source>675</item_source></td>
 +<td> </td>
 +</tr>
 +<tr class="row-odd"><td><parent/></td>
 +<td> </td>
 +</tr>
 +<tr class="row-even"><td><share_type>0</share_type></td>
 +<td>Share type = 0: user</td>
 +</tr>
 +<tr class="row-odd"><td><share_with>ser72</share_with></td>
 +<td>Share with user ser72</td>
 +</tr>
 +<tr class="row-even"><td><file_source>675</file_source></td>
 +<td> </td>
 +</tr>
 +<tr class="row-odd"><td><path>/test share api/ieee.txt</path></td>
 +<td> </td>
 +</tr>
 +<tr class="row-even"><td><permissions>27</permissions></td>
 +<td> </td>
 +</tr>
 +<tr class="row-odd"><td><stime>1386698116</stime></td>
 +<td> </td>
 +</tr>
 +<tr class="row-even"><td><expiration/></td>
 +<td> </td>
 +</tr>
 +<tr class="row-odd"><td><token/></td>
 +<td> </td>
 +</tr>
 +<tr class="row-even"><td><storage>4</storage></td>
 +<td> </td>
 +</tr>
 +<tr class="row-odd"><td><mail_send>0</mail_send></td>
 +<td> </td>
 +</tr>
 +<tr class="row-even"><td><share_with_displayname>ser72</share_with_displayname></td>
 +<td> </td>
 +</tr>
 +<tr class="row-odd"><td></element></td>
 +<td> </td>
 +</tr>
 +<tr class="row-even"><td></data></td>
 +<td> </td>
 +</tr>
 +<tr class="row-odd"><td></ocs></td>
 +<td> </td>
 +</tr>
 +</tbody>
 +</table>
 +</div>
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/sharing_api/get_shares_from_a_specific_file_or_folder.html
index f7c455e,0000000..62a5ea6
mode 100644,000000..100644
--- a/core/doc/admin/sharing_api/get_shares_from_a_specific_file_or_folder.html
+++ b/core/doc/admin/sharing_api/get_shares_from_a_specific_file_or_folder.html
@@@ -1,498 -1,0 +1,520 @@@
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>Get Shares from a Specific File or Folder — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '../',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="../_static/jquery.js"></script>
 +    <script type="text/javascript" src="../_static/underscore.js"></script>
 +    <script type="text/javascript" src="../_static/doctools.js"></script>
 +    <script type="text/javascript" src="../_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
++    <link rel="up" title="Sharing API" href="index.html" />
++    <link rel="next" title="Get Information about a known share" href="get_information_about_a_known_share.html" />
++    <link rel="prev" title="Get All Shares" href="get_all_shares.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="../contents.html">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
- <ul>
++<ul class="current">
 +<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../apps/index.html">Apps</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1 current"><a class="reference internal" href="index.html">Sharing API</a><ul class="current">
++<li class="toctree-l2"><a class="reference internal" href="get_all_shares.html">Get All Shares</a></li>
++<li class="toctree-l2 current"><a class="current reference internal" href="">Get Shares from a Specific File or Folder</a><ul>
++<li class="toctree-l3"><a class="reference internal" href="#poster-default-arguments">Poster – Default arguments</a></li>
++<li class="toctree-l3"><a class="reference internal" href="#curl-default-configuration">Curl – Default configuration</a></li>
++<li class="toctree-l3"><a class="reference internal" href="#output">Output</a></li>
++<li class="toctree-l3"><a class="reference internal" href="#poster-to-add-another-argument-such-as-re-shares">Poster – To add another argument, such as re-shares</a></li>
++<li class="toctree-l3"><a class="reference internal" href="#curl-to-add-another-argument-such-as-re-shares">Curl – To add another argument, such as re-shares</a></li>
++<li class="toctree-l3"><a class="reference internal" href="#id1">Output</a></li>
++</ul>
++</li>
++<li class="toctree-l2"><a class="reference internal" href="get_information_about_a_known_share.html">Get Information about a known share</a></li>
++<li class="toctree-l2"><a class="reference internal" href="create_a_new_share.html">Create a new Share</a></li>
++<li class="toctree-l2"><a class="reference internal" href="delete_share.html">Delete Share</a></li>
++<li class="toctree-l2"><a class="reference internal" href="index.html#introduction">Introduction</a></li>
++</ul>
++</li>
 +<li class="toctree-l1"><a class="reference internal" href="../config/index.html">The Configuration File</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <div class="section" id="get-shares-from-a-specific-file-or-folder">
 +<h1>Get Shares from a Specific File or Folder<a class="headerlink" href="#get-shares-from-a-specific-file-or-folder" title="Permalink to this headline">¶</a></h1>
 +<p>The following will provide a list shares for a specific file.
 +The input is the full path of the desired file.
 +The output is a list of everyone who has the file shared with them.</p>
 +<table border="1" class="docutils">
 +<colgroup>
 +<col width="18%" />
 +<col width="17%" />
 +<col width="7%" />
 +<col width="58%" />
 +</colgroup>
 +<tbody valign="top">
 +<tr class="row-odd"><td><strong>Syntax</strong></td>
 +<td><Base URL></td>
 +<td> </td>
 +<td> </td>
 +</tr>
 +<tr class="row-even"><td><strong>Method</strong></td>
 +<td>GET</td>
 +<td> </td>
 +<td> </td>
 +</tr>
 +<tr class="row-odd"><td><strong>Mandatory Argument</strong></td>
 +<td>Path</td>
 +<td>string</td>
 +<td>Path to file or folder</td>
 +</tr>
 +<tr class="row-even"><td><strong>Argument</strong></td>
 +<td>Reshares</td>
 +<td>boolean</td>
 +<td><p class="first">If set to ‘false’ (default), only shares from the current user are returned</p>
 +<p class="last">If set to ‘true’, all shares from the given file are returned</p>
 +</td>
 +</tr>
 +<tr class="row-odd"><td><strong>Argument</strong></td>
 +<td>Subfiles</td>
 +<td>boolean</td>
 +<td><p class="first">If set to ‘false’ (default), lists only the folder being shared</p>
 +<p class="last">If set to ‘true’, all shared files within the folder are returned.</p>
 +</td>
 +</tr>
 +<tr class="row-even"><td><strong>Result</strong></td>
 +<td>XML code with shares</td>
 +<td> </td>
 +<td> </td>
 +</tr>
 +</tbody>
 +</table>
 +<p>The following is a list of returned status codes:</p>
 +<table border="1" class="docutils">
 +<colgroup>
 +<col width="25%" />
 +<col width="75%" />
 +</colgroup>
 +<tbody valign="top">
 +<tr class="row-odd"><td>HTTP Status Code</td>
 +<td>Description</td>
 +</tr>
 +<tr class="row-even"><td>100</td>
 +<td>Successful</td>
 +</tr>
 +<tr class="row-odd"><td>400</td>
 +<td>Not a directory (if the ‘subfile’ argument was used)</td>
 +</tr>
 +<tr class="row-even"><td>404</td>
 +<td>File does not exist</td>
 +</tr>
 +</tbody>
 +</table>
 +<div class="section" id="poster-default-arguments">
 +<h2>Poster – Default arguments<a class="headerlink" href="#poster-default-arguments" title="Permalink to this headline">¶</a></h2>
 +<p>This example shows the output of share information for “test share api/ieee.txt”</p>
 +<table border="1" class="docutils">
 +<colgroup>
 +<col width="25%" />
 +<col width="75%" />
 +</colgroup>
 +<tbody valign="top">
 +<tr class="row-odd"><td>Field</td>
 +<td>Value</td>
 +</tr>
 +<tr class="row-even"><td><strong>URL</strong></td>
 +<td>Base URL for the API of the ownCloud server</td>
 +</tr>
 +<tr class="row-odd"><td><strong>User Auth</strong></td>
 +<td>User ID of the file owner</td>
 +</tr>
 +<tr class="row-even"><td><strong>Password</strong></td>
 +<td>User’s Password</td>
 +</tr>
 +<tr class="row-odd"><td><strong>Name</strong></td>
 +<td>Argument being passed</td>
 +</tr>
 +<tr class="row-even"><td><strong>Value</strong></td>
 +<td>Full path of file/folder shared</td>
 +</tr>
 +</tbody>
 +</table>
 +<p>Navigate to the “Parameters” tab and input the Name and value.</p>
 +<p><img alt="10000000000002720000013FB6EDA793_png" src="../_images/10000000000002720000013FB6EDA793.png" style="width: 6.5in; height: 3.3126in;" /></p>
 +<p>Navigate to the “Content to Send” tab and select “Body from Parameters” to move the required parameters to the query.</p>
 +<p><img alt="1000000000000291000001951B69B9A6_png" src="../_images/1000000000000291000001951B69B9A6.png" style="width: 6.5in; height: 4.0071in;" /></p>
 +<p>Select GET.</p>
 +</div>
 +<div class="section" id="curl-default-configuration">
 +<h2>Curl – Default configuration<a class="headerlink" href="#curl-default-configuration" title="Permalink to this headline">¶</a></h2>
 +<p>$ curl –G –data “path=test_share_api/ieee.txt” http://<userid>:<password>@<ip>/ocs/v1.php/apps/files_sharing/api/v1/shares</p>
 +</div>
 +<div class="section" id="output">
 +<h2>Output<a class="headerlink" href="#output" title="Permalink to this headline">¶</a></h2>
 +<table border="1" class="docutils">
 +<colgroup>
 +<col width="64%" />
 +<col width="36%" />
 +</colgroup>
 +<tbody valign="top">
 +<tr class="row-odd"><td><?xml version=”1.0”?></td>
 +<td> </td>
 +</tr>
 +<tr class="row-even"><td><ocs></td>
 +<td> </td>
 +</tr>
 +<tr class="row-odd"><td><meta></td>
 +<td> </td>
 +</tr>
 +<tr class="row-even"><td><status>ok</status></td>
 +<td> </td>
 +</tr>
 +<tr class="row-odd"><td><statuscode>100</statuscode></td>
 +<td>Status=100: Successful</td>
 +</tr>
 +<tr class="row-even"><td><message/></td>
 +<td> </td>
 +</tr>
 +<tr class="row-odd"><td></meta></td>
 +<td> </td>
 +</tr>
 +<tr class="row-even"><td><data></td>
 +<td> </td>
 +</tr>
 +<tr class="row-odd"><td><element></td>
 +<td> </td>
 +</tr>
 +<tr class="row-even"><td><id>7</id></td>
 +<td>Share ID=7</td>
 +</tr>
 +<tr class="row-odd"><td><item_type>file</item_type></td>
 +<td> </td>
 +</tr>
 +<tr class="row-even"><td><item_source>675</item_source></td>
 +<td> </td>
 +</tr>
 +<tr class="row-odd"><td><parent/></td>
 +<td> </td>
 +</tr>
 +<tr class="row-even"><td><share_type>0</share_type></td>
 +<td>Share Type=0: user</td>
 +</tr>
 +<tr class="row-odd"><td><share_with>ser72</share_with></td>
 +<td>Share with user ser72</td>
 +</tr>
 +<tr class="row-even"><td><file_source>675</file_source></td>
 +<td> </td>
 +</tr>
 +<tr class="row-odd"><td><path>/test share api/ieee.txt</path></td>
 +<td>File /test share api/ieee.txt</td>
 +</tr>
 +<tr class="row-even"><td><permissions>27</permissions></td>
 +<td>Permissions 27</td>
 +</tr>
 +<tr class="row-odd"><td><stime>1386698116</stime></td>
 +<td> </td>
 +</tr>
 +<tr class="row-even"><td><expiration/></td>
 +<td> </td>
 +</tr>
 +<tr class="row-odd"><td><token/></td>
 +<td> </td>
 +</tr>
 +<tr class="row-even"><td><storage>4</storage></td>
 +<td> </td>
 +</tr>
 +<tr class="row-odd"><td><mail_send>0</mail_send></td>
 +<td> </td>
 +</tr>
 +<tr class="row-even"><td><share_with_displayname>ser72</share_with_displayname></td>
 +<td> </td>
 +</tr>
 +<tr class="row-odd"><td></element></td>
 +<td> </td>
 +</tr>
 +<tr class="row-even"><td></data></td>
 +<td> </td>
 +</tr>
 +<tr class="row-odd"><td></ocs></td>
 +<td> </td>
 +</tr>
 +</tbody>
 +</table>
 +</div>
 +<div class="section" id="poster-to-add-another-argument-such-as-re-shares">
 +<h2>Poster – To add another argument, such as re-shares<a class="headerlink" href="#poster-to-add-another-argument-such-as-re-shares" title="Permalink to this headline">¶</a></h2>
 +<p>This example shows the output of share information for “test share api/ieee.txt”.
 +reshares is set to true which will show output if the file is re-shared by another user.</p>
 +<p><img alt="1000000000000304000001B964698779_png" src="../_images/1000000000000304000001B964698779.png" style="width: 6.5in; height: 3.7134in;" /></p>
 +<p>Navigate to the “Content to Send” tab and select “Body from Parameters”</p>
 +<p><img alt="100000000000029B0000018885B5282E_png" src="../_images/100000000000029B0000018885B5282E.png" style="width: 6.5in; height: 3.8201in;" /></p>
 +<p>Select Get</p>
 +</div>
 +<div class="section" id="curl-to-add-another-argument-such-as-re-shares">
 +<h2>Curl – To add another argument, such as re-shares<a class="headerlink" href="#curl-to-add-another-argument-such-as-re-shares" title="Permalink to this headline">¶</a></h2>
 +<p>$ curl –G –data “path=test_share_api/ieee.tx&reshares=true” http://<userid>:<password>@<ip>/ocs/v1.php/apps/files_sharing/api/v1/shares</p>
 +</div>
 +<div class="section" id="id1">
 +<h2>Output<a class="headerlink" href="#id1" title="Permalink to this headline">¶</a></h2>
 +<table border="1" class="docutils">
 +<colgroup>
 +<col width="60%" />
 +<col width="40%" />
 +</colgroup>
 +<tbody valign="top">
 +<tr class="row-odd"><td><?xml version=”1.0”?></td>
 +<td> </td>
 +</tr>
 +<tr class="row-even"><td><ocs></td>
 +<td> </td>
 +</tr>
 +<tr class="row-odd"><td><meta></td>
 +<td> </td>
 +</tr>
 +<tr class="row-even"><td><status>ok</status></td>
 +<td> </td>
 +</tr>
 +<tr class="row-odd"><td><statuscode>100</statuscode></td>
 +<td>Status=100: Successful</td>
 +</tr>
 +<tr class="row-even"><td><message/></td>
 +<td> </td>
 +</tr>
 +<tr class="row-odd"><td></meta></td>
 +<td> </td>
 +</tr>
 +<tr class="row-even"><td><data></td>
 +<td> </td>
 +</tr>
 +<tr class="row-odd"><td><element></td>
 +<td> </td>
 +</tr>
 +<tr class="row-even"><td><id>7</id></td>
 +<td>Share id = 7</td>
 +</tr>
 +<tr class="row-odd"><td><item_type>file</item_type></td>
 +<td> </td>
 +</tr>
 +<tr class="row-even"><td><item_source>675</item_source></td>
 +<td> </td>
 +</tr>
 +<tr class="row-odd"><td><parent/></td>
 +<td> </td>
 +</tr>
 +<tr class="row-even"><td><share_type>0</share_type></td>
 +<td>Share Type=0: User</td>
 +</tr>
 +<tr class="row-odd"><td><share_with>ser72</share_with></td>
 +<td>Share with user ser72</td>
 +</tr>
 +<tr class="row-even"><td><file_source>675</file_source></td>
 +<td> </td>
 +</tr>
 +<tr class="row-odd"><td><path>/test share api/ieee.txt</path></td>
 +<td> </td>
 +</tr>
 +<tr class="row-even"><td><permissions>27</permissions></td>
 +<td>Permissions 27</td>
 +</tr>
 +<tr class="row-odd"><td><stime>1386698116</stime></td>
 +<td> </td>
 +</tr>
 +<tr class="row-even"><td><expiration/></td>
 +<td> </td>
 +</tr>
 +<tr class="row-odd"><td><token/></td>
 +<td> </td>
 +</tr>
 +<tr class="row-even"><td><storage>4</storage></td>
 +<td> </td>
 +</tr>
 +<tr class="row-odd"><td><mail_send>0</mail_send></td>
 +<td> </td>
 +</tr>
 +<tr class="row-even"><td><share_with_displayname>ser72</share_with_displayname></td>
 +<td> </td>
 +</tr>
 +<tr class="row-odd"><td></element></td>
 +<td> </td>
 +</tr>
 +<tr class="row-even"><td><element></td>
 +<td> </td>
 +</tr>
 +<tr class="row-odd"><td><id>8</id></td>
 +<td>Share id 8</td>
 +</tr>
 +<tr class="row-even"><td><item_type>file</item_type></td>
 +<td> </td>
 +</tr>
 +<tr class="row-odd"><td><parent>7</parent></td>
 +<td> </td>
 +</tr>
 +<tr class="row-even"><td><share_type>0</share_type></td>
 +<td>Parent share id = 7</td>
 +</tr>
 +<tr class="row-odd"><td><share_with>ser73</share_with></td>
 +<td>Share with ser73</td>
 +</tr>
 +<tr class="row-even"><td><file_source>675</file_source></td>
 +<td> </td>
 +</tr>
 +<tr class="row-odd"><td><path>/test share api/ieee.txt</path></td>
 +<td>Share file /test share api/ieee.txt</td>
 +</tr>
 +<tr class="row-even"><td><permissions>19</permissions></td>
 +<td>Permissions 19 – read, update, share</td>
 +</tr>
 +<tr class="row-odd"><td><stime>1386698465</stime></td>
 +<td> </td>
 +</tr>
 +<tr class="row-even"><td><expiration/></td>
 +<td> </td>
 +</tr>
 +<tr class="row-odd"><td><token/></td>
 +<td> </td>
 +</tr>
 +<tr class="row-even"><td><storage>4</storage></td>
 +<td> </td>
 +</tr>
 +<tr class="row-odd"><td><mail_send>0</mail_send></td>
 +<td> </td>
 +</tr>
 +<tr class="row-even"><td><share_with_displayname>ser73</share_with_displayname></td>
 +<td> </td>
 +</tr>
 +<tr class="row-odd"><td></element></td>
 +<td> </td>
 +</tr>
 +<tr class="row-even"><td></data></td>
 +<td> </td>
 +</tr>
 +<tr class="row-odd"><td></ocs></td>
 +<td> </td>
 +</tr>
 +</tbody>
 +</table>
 +</div>
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/doc/admin/sharing_api/index.html
index b871044,0000000..455964d
mode 100644,000000..100644
--- a/core/doc/admin/sharing_api/index.html
+++ b/core/doc/admin/sharing_api/index.html
@@@ -1,195 -1,0 +1,211 @@@
 +
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 +
 +
 +<html xmlns="http://www.w3.org/1999/xhtml">
 +  <head>
 +    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 +    
 +    <title>Sharing API — ownCloud Administrators Manual 6.0 documentation</title>
 +    
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/style.css" type="text/css" />
 +    <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
 +    
 +    <script type="text/javascript">
 +      var DOCUMENTATION_OPTIONS = {
 +        URL_ROOT:    '../',
 +        VERSION:     '6.0',
 +        COLLAPSE_INDEX: false,
 +        FILE_SUFFIX: '.html',
 +        HAS_SOURCE:  true
 +      };
 +    </script>
 +    <script type="text/javascript" src="../_static/jquery.js"></script>
 +    <script type="text/javascript" src="../_static/underscore.js"></script>
 +    <script type="text/javascript" src="../_static/doctools.js"></script>
 +    <script type="text/javascript" src="../_static/bootstrap.js"></script>
 +    <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
++    <link rel="next" title="Get All Shares" href="get_all_shares.html" />
++    <link rel="prev" title="Quota Calculation" href="../quota/index.html" />
 +<script type="text/javascript">
 +(function () {
 +  /**
 +   * Patch TOC list.
 +   *
 +   * Will mutate the underlying span to have a correct ul for nav.
 +   *
 +   * @param $span: Span containing nested UL's to mutate.
 +   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
 +   */
 +  var patchToc = function ($ul, minLevel) {
 +    var findA;
 +
 +    // Find all a "internal" tags, traversing recursively.
 +    findA = function ($elem, level) {
 +      var level = level || 0,
 +        $items = $elem.find("> li > a.internal, > ul, > li > ul");
 +
 +      // Iterate everything in order.
 +      $items.each(function (index, item) {
 +        var $item = $(item),
 +          tag = item.tagName.toLowerCase(),
 +          pad = 15 + ((level - minLevel) * 10);
 +
 +        if (tag === 'a' && level >= minLevel) {
 +          // Add to existing padding.
 +          $item.css('padding-left', pad + "px");
 +          console.log(level, $item, 'padding-left', pad + "px");
 +        } else if (tag === 'ul') {
 +          // Recurse.
 +          findA($item, level + 1);
 +        }
 +      });
 +    };
 +
 +    console.log("HERE");
 +    findA($ul);
 +  };
 +
 +  $(document).ready(function () {
 +    // Add styling, structure to TOC's.
 +    $(".dropdown-menu").each(function () {
 +      $(this).find("ul").each(function (index, item){
 +        var $item = $(item);
 +        $item.addClass('unstyled');
 +      });
 +      $(this).find("li").each(function () {
 +        $(this).parent().append(this);
 +      });
 +    });
 +
 +    // Patch in level.
 +    patchToc($("ul.globaltoc"), 2);
 +    patchToc($("ul.localtoc"), 2);
 +
 +    // Enable dropdown.
 +    $('.dropdown-toggle').dropdown();
 +  });
 +}());
 +</script>
 +
 +  </head>
 +  <body>
 +  
 +
 +<div class="container">
 +  <div class="content">
 +    <div class="page-header">
 +      <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
 +
 +    </div>
 +    
 +			<div class="row">
 +				<div class="span3">
 +					<div class="sidebar">
 +						<div class="well">
 +							<div class="menu-support-container">
 +								<ul id="menu-support" class="menu">
 +									<ul>
 +										<li><a href="../contents.html">Overview</a></li>
 +									</ul>
 +                  <ul>
 +<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
 +</ul>
- <ul>
++<ul class="current">
 +<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../apps/index.html">Apps</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../cron/index.html">Driving Events with Cron</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../quota/index.html">Quota Calculation</a></li>
++<li class="toctree-l1 current"><a class="current reference internal" href="">Sharing API</a><ul>
++<li class="toctree-l2"><a class="reference internal" href="get_all_shares.html">Get All Shares</a></li>
++<li class="toctree-l2"><a class="reference internal" href="get_shares_from_a_specific_file_or_folder.html">Get Shares from a Specific File or Folder</a></li>
++<li class="toctree-l2"><a class="reference internal" href="get_information_about_a_known_share.html">Get Information about a known share</a></li>
++<li class="toctree-l2"><a class="reference internal" href="create_a_new_share.html">Create a new Share</a></li>
++<li class="toctree-l2"><a class="reference internal" href="delete_share.html">Delete Share</a></li>
++<li class="toctree-l2"><a class="reference internal" href="#introduction">Introduction</a><ul>
++<li class="toctree-l3"><a class="reference internal" href="#permissions">Permissions</a></li>
++</ul>
++</li>
++</ul>
++</li>
 +<li class="toctree-l1"><a class="reference internal" href="../config/index.html">The Configuration File</a></li>
 +<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
 +</ul>
 +
 +								</ul>
 +							</div>
 +						</div>
 +					</div>
 +				</div>
 +        
 +
 +				<div class="span9">
 +					<div class="page-content">
 +						
 +  <div class="section" id="sharing-api">
 +<h1>Sharing API<a class="headerlink" href="#sharing-api" title="Permalink to this headline">¶</a></h1>
 +<div class="toctree-wrapper compound">
 +</div>
 +<div class="section" id="introduction">
 +<h2>Introduction<a class="headerlink" href="#introduction" title="Permalink to this headline">¶</a></h2>
 +<p>This document will describe how to use the ownCloud Sharing API.
 +The sharing API allows for the creation of new shares, obtaining a list of shares, and deleting shares.
 +In addition, information such a lists of files shared to users can be obtained.</p>
 +<p>In order to utilize this API, all user ID’s involved in the share, as well as full path names of files is required to be known.</p>
 +<p>Two methods will be shown:
 +Firefox Plugin “Poster” and Curl via the command line.</p>
 +<p>The base URL for all calls to the share API is:
 +owncloud_base_url>/ocs/v1.php/apps/files_sharing/api/v1/shares</p>
 +<div class="section" id="permissions">
 +<h3>Permissions<a class="headerlink" href="#permissions" title="Permalink to this headline">¶</a></h3>
 +<p>The following table describes the Permissions of a share.
 +The Permissions are contained in the XML code output of the command.</p>
 +<table border="1" class="docutils">
 +<colgroup>
 +<col width="16%" />
 +<col width="84%" />
 +</colgroup>
 +<tbody valign="top">
 +<tr class="row-odd"><td>Value</td>
 +<td>Permissions</td>
 +</tr>
 +<tr class="row-even"><td><strong>1</strong></td>
 +<td>Read only – Default for “public” shares</td>
 +</tr>
 +<tr class="row-odd"><td><strong>2</strong></td>
 +<td>Update</td>
 +</tr>
 +<tr class="row-even"><td><strong>4</strong></td>
 +<td>Create</td>
 +</tr>
 +<tr class="row-odd"><td><strong>8</strong></td>
 +<td>Delete</td>
 +</tr>
 +<tr class="row-even"><td><strong>16</strong></td>
 +<td>Re-share</td>
 +</tr>
 +<tr class="row-odd"><td><strong>31</strong></td>
 +<td>All above – Default for “private” shares</td>
 +</tr>
 +</tbody>
 +</table>
 +<p>To obtain combinations, add the desired values together.
 +For instance, for “Re-Share”, “delete”, “read”, “update”, add 16+8+2+1 = 27.</p>
 +</div>
 +</div>
 +</div>
 +
 +
 +					</div>
 +				</div>
 +			</div>
 +    
 +  </div>
 +</div>
 +  </body>
 +</html>
diff --cc core/skeleton/ownCloudUserManual.pdf
index 628f538,0000000..a3e3d2d
mode 100644,000000..100644
Binary files differ
diff --cc version.php
index d55a56e,a100c3d..29b8262
--- a/version.php
+++ b/version.php
@@@ -1,6 -1,17 +1,6 @@@
 -<?php
 -
 -// We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel when updating major/minor version number.
 -$OC_Version=array(6, 0, 3, 1);
 -
 -// The human readable string
 -$OC_VersionString='6.0.3';
 -
 -// The ownCloud edition
 -$OC_Edition='';
 -
 -// The ownCloud channel
 -$OC_Channel='git';
 -
 -// The build number
 -$OC_Build='';
 -
 +<?php 
- $OC_Version = array(6,0,3,0);
- $OC_VersionString = '6.0.3 RC1';
++$OC_Version = array(6,0,3,1);
++$OC_VersionString = '6.0.3';
 +$OC_Edition = '';
- $OC_Channel = 'testing';
- $OC_Build = '2014-04-23T16:23:29+00:00';
++$OC_Channel = 'stable';
++$OC_Build = '2014-04-29T01:27:10+00:00';

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git



More information about the Pkg-owncloud-commits mailing list