Commit Graph

40 Commits

Author SHA1 Message Date
Daniel Molkentin
fec6de4183 Merge remote-tracking branch 'origin/stable45' 2013-01-04 13:02:30 +01:00
Daniel Molkentin
40651c5b1b remove stray image 2013-01-04 13:02:15 +01:00
Daniel Molkentin
bcfc3afcb9 Merge remote-tracking branch 'origin/stable45' 2013-01-04 12:58:54 +01:00
Daniel Molkentin
d9077e5f04 Add missing images 2013-01-04 12:58:32 +01:00
Daniel Molkentin
4f14d96fdb Merge remote-tracking branch 'origin/stable45' 2013-01-04 12:37:06 +01:00
Daniel Molkentin
6d2acd438d Port and fix calendars chapter 2013-01-04 12:36:46 +01:00
Daniel Molkentin
18c87ba394 Merge remote-tracking branch 'origin/stable45'
Conflicts:
	developer_manual/conf_release.py
	user_manual/conf_release.py
2013-01-03 12:10:41 +01:00
Daniel Molkentin
49dfb6f763 Split HTML into three targets
- doc.owncloud.org: make doc-org
 - doc.owncloud.com: make doc-com
 - release documentation: make release
2012-12-27 19:19:21 +01:00
Daniel Molkentin
35efaf4539 Merge remote-tracking branch 'origin/stable45'
Conflicts:
	developer_manual/conf_release.py
	developer_manual/index.rst
	developer_manual/translation.rst
	user_manual/conf_release.py
	user_manual/sync_kde.rst
2012-12-26 21:33:42 +01:00
Tom Needham
dd1d40aebd Include user migration docs in the manual's menu 2012-12-16 20:39:03 +00:00
Tom Needham
62b993fdb9 Add user account migration documentation 2012-12-16 20:38:13 +00:00
Frank Karlitschek
88f1c5df89 add conf files for the release exports 2012-12-13 16:40:59 +01:00
Frank Karlitschek
195b1a8b6f add a new theme for documentation version that will be shipped with the ownCloud release. also add new conf files that can be used to generate the documentation. The theme is just a copy of the existing ownCloud website theme with some minor changes like theremoval of the header. 2012-12-12 23:07:08 +01:00
Daniel Molkentin
b11cd90139 Fix build 2012-12-11 16:20:41 +01:00
Daniel Molkentin
3803ef9803 Fix build 2012-12-11 16:12:10 +01:00
Daniel Molkentin
c5c7b99cc0 Merge branch 'stable45'
Conflicts:
	admin_manual/index.rst
2012-12-11 15:57:21 +01:00
Daniel Molkentin
5fbfca6696 Add ported user documentation (from CGI). 2012-12-11 15:01:13 +01:00
Daniel Molkentin
d7c1eabe02 Revert "Add ported user documentation (from CGI)."
This belongs into stable45 first.
This reverts commit fca8b245b7.
2012-12-11 14:46:56 +01:00
Daniel Molkentin
fca8b245b7 Add ported user documentation (from CGI). 2012-12-11 14:45:29 +01:00
Brice Maron
305d57c02f Merge branch 'master' of https://github.com/owncloud/documentation 2012-11-29 23:33:26 +00:00
Brice Maron
6273d63e93 Merge branch 'stable45' 2012-11-29 23:33:10 +00:00
Alessandro Cosentino
44ef5964c0 Update user_manual/bookmarks.rst 2012-11-29 18:30:28 -05:00
Alessandro Cosentino
aff0ffbdec Update user_manual/bookmarks.rst
Some proofreading in the first two paragraphs
2012-11-29 18:29:40 -05:00
Brice Maron
8259067b65 Quick fix small char problem 2012-11-29 23:12:57 +00:00
Brice Maron
aba15f31aa Merge branch 'stable45' 2012-11-29 22:48:57 +00:00
Brice Maron
6447f06e6c Add contact doc
Mix migrate from GCI student job done on the master branch
2012-11-29 22:48:11 +00:00
Daniel Molkentin
09894e57d1 Merge remote branch 'origin/stable45' 2012-11-28 21:20:36 +01:00
Brice Maron
d9ca73f7a4 Adding first shot of bookmark user documentation.
First version ported from master doc of the GCI.
2012-11-28 19:48:53 +00:00
Daniel Molkentin
bdd4e397ba Merge remote branch 'origin/stable45' 2012-11-28 18:17:52 +01:00
Daniel Molkentin
182638ff4c Fix up PDF TOC, add logo 2012-11-28 18:15:44 +01:00
Daniel Molkentin
11610480b3 Bump to 5.0 2012-11-28 14:40:36 +01:00
Sam Tuke
0986187ce3 Added instruction for Cyberduck 4.2.1) 2012-11-21 16:01:50 +00:00
Daniel Molkentin
e397fd3f5c use owncloud theme in all manuals 2012-11-20 19:08:44 +01:00
MTRichards
1a54108d8f Update user_manual/connecting/webdav.rst 2012-10-28 12:07:12 -03:00
MTRichards
d004e7062d Update user_manual/connecting/webdav.rst 2012-10-28 11:26:45 -03:00
MTRichards
fbedc90e77 Update user_manual/connecting/webdav.rst 2012-10-28 11:22:44 -03:00
Daniel Molkentin
d4c6eacbac Simlify markup 2012-10-28 13:36:57 +01:00
Daniel Molkentin
ce15d6bd13 Add documentation on webdav 2012-10-28 13:04:54 +01:00
Daniel Molkentin
8c091e4801 Fix c&p error 2012-10-27 12:50:28 +02:00
Daniel Molkentin
a35f68df37 Initial server doc layout with bootstrap theme 2012-10-27 00:05:30 +02:00