Hefee
28b694b170
Merge branch '2.1'
2016-02-20 10:34:34 +01:00
Carla Schroder
a32381a2a4
doc updates for 2.1.1 release
2016-02-18 10:31:51 -08:00
RealRancor
ed06fc51a0
Add chunkSize config to documentation
2016-02-12 11:34:27 +01:00
Olivier Goffart
93308faeb9
Merge remote-tracking branch 'origin/2.1'
...
Conflicts:
doc/building.rst
2016-02-08 14:28:25 +01:00
Daniel Molkentin
65655584e9
Doc: Instruct to use sha256 for Authenticode signing
2016-02-06 15:01:31 +01:00
Daniel Molkentin
b0acc475b0
Bring build documentation up to date, use docker for Win32 xbuild
2016-02-05 14:55:29 +01:00
Daniel Molkentin
6701927840
Move ocdoc to current documentation master to catch up with new design
2016-02-04 14:21:23 +01:00
Daniel Molkentin
dd76d72d61
Merge remote-tracking branch 'origin/2.1'
2016-01-26 14:09:38 +01:00
Markus Goetz
95615eaca7
Merge pull request #4338 from owncloud/mtimes
...
add note re mtime syncing
2016-01-11 16:44:56 +01:00
Daniel Molkentin
51a70cee3d
Document all owncloudcmd switches in man page/doc
...
Fixes #4290
2016-01-06 22:33:39 +01:00
Carla Schroder
aafab73a82
add note re mtime syncing
2016-01-06 12:45:23 -08:00
Olivier Goffart
639301e9e9
Merge remote-tracking branch 'origin/2.1'
...
Conflicts:
VERSION.cmake
2016-01-04 12:38:59 +01:00
Klaas Freitag
a759ba1d9e
Do not use nullptr, old compilers die on it.
2015-12-22 15:07:51 +01:00
Christian Kamm
ae806e8214
Merge remote-tracking branch 'origin/2.1'
2015-12-10 11:07:20 +01:00
Daniel Molkentin
73acad2c92
FF doc subrepo to adjust to new .org theming
2015-12-08 01:02:46 +01:00
Carla Schroder
78df3a35b4
added desktop sharing
2015-12-03 10:29:44 -08:00
Jürgen Weigert
e67bb1c5ce
Merge pull request #4201 from owncloud/jnweiger-patch-1
...
improved linux build instructions.
2015-12-03 14:05:24 +01:00
Jürgen Weigert
f2c9a49c50
fixed formatting lines 212 215
2015-12-03 14:04:43 +01:00
Carla Schroder
3d71d6c96f
more image fixes
2015-12-02 12:10:20 -08:00
Carla Schroder
41c3c107d4
clean up screenshot
2015-12-02 12:06:43 -08:00
Carla Schroder
24cad42a86
corrections to 2.1 user manual
2015-12-02 12:02:55 -08:00
Carla Schroder
1a564b1672
more updates to 2.1 user manual
2015-12-02 11:52:42 -08:00
Carla Schroder
339caf9dc8
updates for 2.1 release
2015-11-30 17:09:27 -08:00
Jürgen Weigert
f54f48615d
Update building.rst
...
ah, and the instructions miss the 'cd client' before git submodule init.
2015-11-26 12:06:32 +01:00
Jürgen Weigert
06bb97e6d9
Update building.rst
2015-11-26 12:02:23 +01:00
Jürgen Weigert
0763f65329
improved linux build instructions.
...
I am using :: lists, as the `` versions mangle multi-line commands all in one long line.
The cmake command should just end in .., not in ../client
2015-11-26 11:55:23 +01:00
Klaas Freitag
8abaf92083
Merge git://github.com/NvanAdrichem/client into 2.1, pull #4060
2015-11-18 17:00:19 +01:00
Daniel Molkentin
7ba88cc9e3
Merge remote-tracking branch 'origin/2.0'
2015-11-17 12:57:31 +01:00
Daniel Molkentin
914df32587
Documentation: Fix PDF logo, version number
2015-11-17 12:55:41 +01:00
Niels van Adrichem
572d9bdf1a
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
src/gui/share.h
2015-11-05 14:42:26 +01:00
RealRancor
854264c3d2
Backport #4052 to 2.0
2015-11-04 15:55:07 +01:00
Niels van Adrichem
42ef09e3bb
Updated documentation for Non Shibboleth authentication and customized WebDAV Paths
2015-11-03 13:43:26 +01:00
Carla Schroder
a59c3ef278
some doc fixes & updates
2015-11-02 11:18:31 -08:00
RealRancor
8c5ef2f1c3
Make registry key a code block in autoupdate docs.
2015-10-31 19:05:21 +01:00
Olivier Goffart
fac00348d9
Use the term folder sync connection in more places #3757
2015-10-27 12:12:21 +01:00
Daniel Molkentin
c7bf09c3d4
Merge remote-tracking branch 'origin/2.0'
2015-10-21 18:49:58 +02:00
Carla Schroder
daf6d8772f
update 3-dot menu
2015-10-21 09:44:38 -07:00
Carla Schroder
10f59bf3ad
Revert "Update "..." menu documentation for 2.0"
2015-10-14 09:03:08 -07:00
Phil Davis
0f4e88eeaa
Update "..." menu documentation for 2.0
...
This menu in 2.0.* now has 4 options.
The small screenshot needs updating also. @carlaschroder it is probably best if you take a new screen shot from whatever client version you have been using for screen shots. That way they will all have a consistent look.
2015-10-08 12:28:15 +05:45
RealRancor
67a71ff10f
Backport #3916 to 2.0
2015-10-05 16:22:11 +02:00
RealRancor
8fd2b8d829
Fix linkname in architecture.rst.
2015-10-03 21:42:23 +02:00
Christian Kamm
efefc2d986
Merge branch '2.0'
...
Conflicts:
doc/images/menu.png
doc/images/settings_network.png
2015-10-02 15:44:50 +02:00
RealRancor
2c9d418423
Fix registry key syntax in FAQ.
2015-09-27 20:38:53 +02:00
RealRancor
1cb518cb13
Fix registry key syntax in FAQ.
2015-09-27 20:19:06 +02:00
Carla Schroder
8c02034838
corrections
2015-09-21 10:19:49 -07:00
Carla Schroder
caaf8c841e
perty new screenies and updates
2015-09-18 14:36:00 -07:00
Carla Schroder
5f857a49b8
restore missing image to fix build failure of PR 3838
2015-09-18 09:03:32 -07:00
Carla Schroder
68ed64e11d
remove ugly images
2015-09-17 17:44:21 -07:00
Carla Schroder
043655bd7a
nice new screenshots from windows pc
2015-09-17 17:41:22 -07:00
Carla Schroder
3ba4e38693
new screenshots and revised installation page
2015-09-16 09:45:50 -07:00
Carla Schroder
25d1defd73
move new features to introduction, fix missing images
2015-09-15 16:34:45 -07:00
Phil Davis
429f8229b3
Adjust log out description
...
Note: This whole doc needs review and updating of text and screen shots for 2.0 multi-account client.
2015-09-10 22:12:24 +05:45
Klaas Freitag
5f660bf080
GUI: Replace term "sign in" with "Log in" and friends.
...
Also with doc changes.
2015-09-10 17:36:28 +02:00
hh.lohmann
e00cc4ed5b
/doc/autoupdate.rst: "Migrate to the following directory" => "Edit this Registry key"
...
Registry keys are no directories; you would not "migrate" to keys if you are just about to switch to them; resembling formulas as "Edit these / this Registry key/s" ease fast reading, for that also ":" instead of "::" at the end (formatting what follows)
2015-09-10 01:37:40 +02:00
hh.lohmann
0329a8be2e
/doc/autoupdate.rst: "Migrate to the following directory" => "Edit this Registry key"
...
Registry keys are no directories; you would not "migrate" to keys if you are just about to switch to them; resembling formulas as "Edit these / this Registry key/s" ease fast reading, for that also ":" instead of "::" at the end (formatting what follows)
2015-09-09 12:33:25 +02:00
hh.lohmann
79f64abfc3
/doc/autoupdate.rst: "32-/64-bit" => "32-/64-bit-Windows"
...
Should be stated clearly that there are no alternative 32- / 64-bit-ownCloud-Clients, but just a 32-bit-ownCloud-Client that is treated differently in 32- / 64-bit-Windows
2015-09-09 12:10:10 +02:00
Olivier Goffart
39bff056a6
Merge remote-tracking branch 'origin/2.0'
2015-09-05 18:14:30 +02:00
Olivier Goffart
b6e0802203
Doc for owncloudcmd: we only use the config of the gui client for the crendential #3293
2015-09-03 11:18:02 +02:00
Olivier Goffart
3ba5e27d02
Merge branch '2.0'
2015-09-01 17:57:56 +02:00
Olivier Goffart
950bc578d0
Merge branch '2.0'
2015-08-31 14:34:04 +02:00
Carla Schroder
b3a462d452
more typos
2015-08-31 11:12:47 +02:00
Carla Schroder
916f522010
typo correction
2015-08-31 11:03:14 +02:00
Carla Schroder
967b533e37
typo corrections, cross-refs
2015-08-31 10:48:43 +02:00
carla schroder
ab4fa905fc
updates for 2.0 release
2015-08-29 16:26:48 +02:00
Carla Schroder
45835f1cf9
Update navigating.rst
2015-08-27 10:25:19 +02:00
Carla Schroder
cf543d1eb0
Update navigating.rst
2015-08-27 10:20:15 +02:00
Carla Schroder
9f24f10186
Update installing.rst
2015-08-27 10:07:54 +02:00
Carla Schroder
bc37668e9f
1st batch of updates for 2.0
2015-08-21 13:19:15 -07:00
Daniel Molkentin
da93f37067
doc: Update Windows build instructions
2015-08-18 11:53:57 +02:00
Daniel Molkentin
bd39543542
Merge pull request #3623 from owncloud/phil-davis-conffile-20
...
Conffile doc typo 2.0
2015-08-18 11:13:46 +02:00
Daniel Molkentin
49949084fb
Merge pull request #3628 from owncloud/phil-davis-FAQ-20
...
FAQ Doc typo 2.0
2015-08-18 11:13:26 +02:00
Daniel Molkentin
b584f37906
Merge pull request #3627 from owncloud/phil-davis-troubleshooting-20
...
Troubleshooting Doc minor typos 2.0
2015-08-18 11:13:17 +02:00
Daniel Molkentin
70f3b91a1e
Merge pull request #3626 from owncloud/phil-davis-architecture-20
...
Architecture Doc typos and formatting 2.0
2015-08-18 11:10:54 +02:00
Daniel Molkentin
15545168d4
Merge pull request #3625 from owncloud/phil-davis-building-20
...
Building Doc minor corrections 2.0
2015-08-18 11:10:38 +02:00
Daniel Molkentin
2d797c9408
Merge pull request #3624 from owncloud/phil-davis-autoupdate-20
...
Autoupdate Doc bullet point rendering 2.0
2015-08-18 11:10:35 +02:00
Daniel Molkentin
8d5ffccaf1
Merge pull request #3622 from owncloud/phil-davis-navigating-20
...
Navigating doc typos 2.0
2015-08-18 11:10:29 +02:00
Phil Davis
e54bbcd15f
FAQ Doc typo
2015-08-14 17:48:37 +05:45
Phil Davis
149d6c32c1
Troubleshooting Doc minor typos 2.0
2015-08-14 17:46:42 +05:45
Phil Davis
0ca3df917e
Architecture Doc typos and formatting 2.0
2015-08-14 17:43:36 +05:45
Phil Davis
12fe59e3ce
Building Doc minor corrections
2015-08-14 17:41:02 +05:45
Phil Davis
3bfb8f6906
Autoupdate Doc bullet point rendering 2.0
...
A space at the start of the bullet point about "Locate and open the following file" seems to be causing that bullet point to not line up nicely on the rendered page.
2015-08-14 17:38:41 +05:45
Phil Davis
7527ee0cd3
Conffile doc typo
2015-08-14 17:35:18 +05:45
Phil Davis
080ec49fae
Navigating doc typos
...
Some "downloading" that should be "uploading".
Some bullet points with "code" items were rendering with bold, italics on the published page. These seemed to be bullet points that had 3 spaces at the start of their 2nd line of text. Other bullet points that rendered correctly had only 2 spaces. So I removed the extra space. I hope it renders nicely in the published form - it is a bit hard to know in the GitHub Preview, because that is trying to show change-sidebars and differences also.
2015-08-14 17:32:32 +05:45
Phil Davis
fe92186ce0
Installing doc typo 2.0
2015-08-14 17:28:47 +05:45
Daniel Molkentin
0735aa1fbd
Structure developer documentation
...
- rename target "doc-dev"
- group into modules
- move to doc/dev
2015-06-29 18:43:21 +02:00
Olivier Goffart
8bcd0261dc
Merge remote-tracking branch 'origin/1.8'
...
Conflicts:
VERSION.cmake
2015-06-15 14:03:46 +02:00
Markus Goetz
827e07700d
Documentation: Mention the git submodules
2015-06-10 16:48:34 +02:00
RealRancor
6ba3324035
Backport #3004 and #2978 to 1.8
2015-05-28 17:11:03 +02:00
RealRancor
8cfb17bca6
Backport #3279 to 1.8
2015-05-28 17:00:59 +02:00
RealRancor
d0f81f466e
Fix syntax issues in troubleshooting docs
2015-05-26 12:55:49 +02:00
Daniel Molkentin
abaf2138cf
Merge pull request #2978 from RealRancor/doc_virus_scanner
...
Add note for on-access virus scanner solutions
2015-05-26 10:32:17 +02:00
Joas Schilling
f4b82a9892
Fix typo in doc
2015-05-13 14:31:21 +02:00
Christian Kamm
8d93af21a1
Doc: Fix the section config values should be in.
2015-05-06 15:55:25 +02:00
ckamm
7c0c7da9bf
Merge pull request #1928 from willyaranda/patch-1
...
Clarify the remotePollInterval variable
2015-05-06 15:53:11 +02:00
Olivier Goffart
ddfb7f3b7a
Merge remote-tracking branch 'origin/1.8'
2015-04-27 12:20:11 +02:00
Carla Schroder
d1fe25cc31
Update owncloudcmd.rst
2015-04-24 11:44:38 -07:00
Carla Schroder
60c18f75b5
update owncloud and owncloudcmd docs
...
Conflicts:
doc/owncloudcmd.rst
2015-04-24 11:42:10 -07:00
Carla Schroder
c7f3791f3d
Update autoupdate.rst
2015-04-24 10:03:51 -07:00
Carla Schroder
ee9d5e6bf0
Update introduction.rst
2015-04-24 10:03:06 -07:00
Carla Schroder
7c4deec800
add more warning that 1.7 clients and older are blocked
2015-04-24 09:54:05 -07:00
Carla Schroder
1fe86bced2
note that linux users need password manager
2015-04-21 13:05:09 -07:00
Carla Schroder
8be6881093
add note to restart windows after update
2015-04-21 10:10:16 -07:00
Carla Schroder
d1e46056ae
Merge pull request #3004 from RealRancor/fix_typo
...
Docs: Added point and missing newline, fixed typo
2015-04-20 10:27:59 -07:00
Carla Schroder
d55d8c0152
add note re linux password managers
2015-03-23 10:57:05 -07:00
Carla Schroder
5b8c9eb16f
add note re password managers
2015-03-23 10:52:57 -07:00
RealRancor
1f327d683a
Added point and missing newline and fixed typo
2015-03-23 13:31:52 +01:00
RealRancor
e9ea895a01
Add note for on-access virus scanner solutions
2015-03-18 09:42:42 +01:00
Carla Schroder
dc33784a76
spelling corrections
2015-03-12 09:48:00 -07:00
Carla Schroder
961df1fc44
fix server side permissions table
2015-03-12 09:46:27 -07:00
Klaas Freitag
286ad0c478
Doc: Formatting fixes
2015-03-12 16:59:12 +01:00
Klaas Freitag
5a6eecd694
doc: Added snippet about custom WebDAV properties.
2015-03-11 14:11:18 +01:00
Daniel Molkentin
5f8af4527e
Update Windows cross build instructions for 1.8
2015-02-27 17:13:14 +01:00
Jocelyn Turcotte
23e248b5d1
shell_integration: Fetch the share menu title from the client on Windows
...
The context menu will now show "Share with ownCloud" instead of "Share" as
it does on other platforms.
This also updates the submodule to point to matching binaries.
2015-02-13 16:08:39 +01:00
Jocelyn Turcotte
07849537cf
Fix Windows building documentation issues
...
Add missing words and clear up why qtkeychain must be built in-source.
2015-02-06 17:10:35 +01:00
Jocelyn Turcotte
667665b809
Add documentation to build on Windows directly with MinGW
...
This doesn't link to the Generic Build Instructions section like other
platforms documentation does since the cmake and make commands are
different.
2015-02-04 16:57:56 +01:00
Carla Schroder
63cda04b56
remove obsolete account setup page
2015-01-30 14:05:47 -08:00
Carla Schroder
6ffc04808d
typo fixes 1.8 install
2015-01-30 12:58:42 -08:00
Carla Schroder
c932e26f83
markup and typo fixes 1.8 install page
2015-01-30 12:54:49 -08:00
Carla Schroder
682ce2e1e2
New page on installing 1.8 client
2015-01-30 12:48:12 -08:00
Carla Schroder
9873204be6
replace references to "Mirall" with "client"
2015-01-30 09:14:42 -08:00
Daniel Molkentin
6e4da53e31
Merge pull request #2638 from owncloud/add-slash-as-ignored-character
...
fix link and add slash as bad character
2015-01-07 15:36:09 +01:00
Olivier Goffart
414ac5433d
Merge branch '1.7'
...
Conflicts:
binary
doc/accountsetup.rst
doc/architecture.rst
doc/navigating.rst
doc/owncloudcmd.rst
doc/troubleshooting.rst
2015-01-05 14:40:53 +01:00
Carla Schroder
7127b989c6
Update navigating.rst
2014-12-31 14:50:54 -08:00
Carla Schroder
3fc755d92f
Markup fixes
2014-12-31 14:48:17 -08:00
Carla Schroder
0dc43e5211
Markup corrections
2014-12-31 14:46:22 -08:00
Carla Schroder
4ddbb17a11
Update architecture.rst
...
Markup corrections
2014-12-31 14:37:28 -08:00
Carla Schroder
bfe31645ab
Markup fixes
2014-12-31 14:34:45 -08:00
Carla Schroder
09f843727d
Update and correct desktop client manual
...
Conflicts:
doc/accountsetup.rst
doc/architecture.rst
doc/navigating.rst
doc/owncloudcmd.rst
2014-12-31 14:31:35 -08:00
Carla Schroder
096511fc89
Update and correct desktop client manual
2014-12-31 11:27:52 -08:00
Carla Schroder
a6bfb23d20
Update troubleshooting.rst
...
Markup corrections
2014-12-30 18:41:50 -08:00
Carla Schroder
c2f3413dc5
Merge pull request #2652 from RealRancor/fix_typos
...
Fixed typos in docs
2014-12-29 13:41:22 -08:00
Carla Schroder
755daeb024
Update troubleshooting.rst
...
More markup fixes
2014-12-29 10:09:42 -08:00
Carla Schroder
26233ac078
Update troubleshooting.rst
...
Markup fixes
2014-12-29 10:07:52 -08:00
RealRancor
2ee2876855
Fixed typos in docs
2014-12-29 18:11:12 +01:00
Carla Schroder
f7ebd2e793
Markup correction
2014-12-26 08:17:15 -08:00
Morris Jobke
e250153204
fix link and add slash as bad character
2014-12-23 11:25:55 +01:00
Carla Schroder
95a380ae9e
fix typos
2014-12-10 08:24:12 -08:00
Daniel Molkentin
e982790ad5
Mirall--
2014-12-09 09:27:47 +01:00
Daniel Molkentin
3016844dd7
Merge branch 'master' into rename_client
...
Conflicts:
README.md
src/gui/folderman.cpp
src/gui/settingsdialog.cpp
src/libsync/accessmanager.cpp
src/libsync/propagateupload.h
2014-12-02 13:37:22 +01:00
Guillermo López Leal
a786511769
Clarify the remotePollInterval variable from https://github.com/owncloud/core/issues/6543
2014-11-14 11:48:30 +01:00
Daniel Molkentin
58f1a9bb30
Rename: Adjust documentation
2014-11-09 23:09:52 +01:00
Daniel Molkentin
e579504181
Merge pull request #2370 from owncloud/icons-overlay-doc
...
Add section on Overlay Icons to 'Using the Synchronization Client'
2014-11-07 16:52:26 +01:00
Carla Schroder
2c1f31cecb
Update autoupdate.rst
...
Corrected configuration file location
2014-10-29 09:56:17 -07:00
Carla Schroder
94be12b9e4
Merge branch 'updater' of https://github.com/owncloud/mirall into updater
2014-10-28 15:01:34 -07:00
Carla Schroder
1862fb77ff
Correct Linux section on disabling update notifications
2014-10-28 14:57:18 -07:00
Carla Schroder
06b619f0ed
Update autoupdate.rst
...
Typo correction
2014-10-28 12:19:05 -07:00
Carla Schroder
f5cc6cfd07
Fix typos and clean up wording
2014-10-28 11:56:49 -07:00
Carla Schroder
0f5cf00e35
Update The Automatic Updater manual page with current information
2014-10-28 11:52:58 -07:00
Daniel Molkentin
b7ce5ba82a
Doc: Fix build documentation, adjust it to 1.7.
...
Fixes #2365
2014-10-27 16:14:32 -04:00
Daniel Molkentin
95a9b0427c
doc: Fix markup in build.rst
2014-10-27 14:54:23 -04:00
r2evans
9cd81d87b2
add 64-bit windows registry location
2014-10-25 07:25:18 -07:00
Carla Schroder
b5da8423a6
Update navigating.rst
2014-10-22 19:24:19 -07:00
Carla Schroder
c3de0a2d4b
Add section on Overlay Icons to 'Using the Synchronization Client'
2014-10-22 19:20:58 -07:00
Daniel Molkentin
6048a7143a
Revert "Remove references to qsqlite3"
...
QtWebkit needs it
This reverts commit b1c10c8454
2014-10-20 10:27:34 +02:00
Markus Goetz
b1c10c8454
Remove references to qsqlite3
2014-10-16 17:51:17 +02:00
Daniel Molkentin
e82b319ee7
Fix owncloud man page formatting
2014-09-18 12:30:20 +02:00
Daniel Molkentin
21bbdd6f49
Update owncloudcmd documentation
2014-09-18 11:36:14 +02:00
Markus Goetz
c313cc02f2
Config: Fix loading of configuration
...
There is a strange bug with Qt, we need to always set the application name, then
we can generate the proper config path.
2014-08-05 00:41:43 +02:00
Daniel Molkentin
6ec218ef11
FF docs submodules
2014-07-01 16:24:34 +02:00
Daniel Molkentin
f8b097669a
Merge remote-tracking branch 'origin/1.6'
...
Conflicts:
VERSION.cmake
doc/building.rst
2014-06-27 15:34:20 +02:00
Klaas Freitag
40d765c73a
Remove version suffix, final release 1.6.1
2014-06-26 16:09:21 +02:00
Daniel Molkentin
23e0af5cc1
Documentation update from Mark.
2014-06-25 22:04:33 +02:00
Klaas Freitag
36331512bc
doc: Updated package list for win32 build.
2014-06-20 14:41:36 +02:00
Kuba Serafinowski
4b3d124b5a
put man docs in the correct /man1 directory
...
man doesn't work here when the docs are in a /man directory
2014-06-04 00:10:18 +03:00
Klaas Freitag
943f9f60e3
Documented core dump catching
2014-05-15 11:11:13 +02:00
hefee
71c11373d8
install doc targets in any case.
...
If a user only builds some parts of the documentation and afterwards
wants to install owncloud-client afterwards via "make install", the
built parts should be installed in any case.
2014-05-08 13:44:35 +02:00
Volkan Gezer
a7a19fad71
Fix note template label
2014-04-16 03:53:37 +02:00
Olivier Goffart
353f21e856
Add a FAQ item for the .eml problem
...
Fixes #1403
2014-03-27 09:55:25 +01:00
Daniel Molkentin
1b5e14fbc5
Update owncloudcmd docs
...
Fixes #1587
2014-03-25 19:04:05 +01:00
Klaas Freitag
e4966ec9d1
Added documentation about owncloudcmd.
2014-03-20 16:35:43 +01:00
Klaas Freitag
57aa86910c
Add dependency on mingw32-sqlite, needed for make package
2014-03-13 14:02:48 +01:00
Klaas Freitag
0c85100c93
Updated build instructions.
...
Conflicts:
doc/building.rst
2014-03-07 10:02:51 +01:00
Olivier Goffart
869793592d
Merge branch '1.5'
...
Conflicts:
VERSION.cmake
src/mirall/owncloudpropagator.cpp
src/mirall/owncloudpropagator.h
2014-02-27 11:40:34 +01:00
Olivier Goffart
1e43d1fa49
Add missing license headers in tests
...
LGPL for csync tests, GPL for mirall tests
2014-02-24 11:08:58 +01:00
Olivier Goffart
2de288c5f3
Merge remote-tracking branch 'origin/1.5'
...
Conflicts:
VERSION.cmake
2014-02-19 10:21:23 +01:00
Klaas Freitag
86e90451fa
Removed not expected whitespace.
2014-02-13 17:21:30 +01:00
Daniel Molkentin
393ac82c6a
Update documentation for 1.5.1
2014-02-13 17:04:51 +01:00
Markus Goetz
372f8b3426
OS X: Document how to disable the auto updater
2014-02-13 14:11:04 +01:00
Daniel Molkentin
beb9752f09
Merge remote-tracking branch 'origin/1.5'
2014-02-12 21:17:06 +01:00
Daniel Molkentin
1eb6e163de
Add documentation on auto update feature
2014-02-12 21:08:28 +01:00
Olivier Goffart
7ae40e13ec
Update the docs now that csync is included
2014-02-12 11:32:19 +01:00
Markus Goetz
19c128ba12
Update building.rst
2014-02-11 11:45:00 +01:00
Markus Goetz
0c0b3f8580
Update building.rst
2014-02-04 08:40:28 +01:00
Markus Goetz
aab621523b
Update building.rst
2014-02-03 20:12:36 +01:00
Klaas Freitag
a1d6cf7d4d
Fix typo in documentation
2014-01-21 12:20:23 +01:00
Klaas Freitag
131945b14b
Doc fixes about ignore files.
2013-12-11 22:08:24 +01:00
Klaas Freitag
4b42743a2a
Better documentation of file ignore patterns.
2013-12-10 13:19:49 +01:00
Daniel Molkentin
72b0f4e573
Add man page for owncloudcmd
...
Fixes #1234
2013-12-04 20:07:05 +01:00
Thomas Müller
6923f26597
Adding missing \ on zypper install command
2013-12-02 11:37:06 +01:00
Daniel Molkentin
c25c7daca7
docs: Add infos about installing the sql plugin and module
...
Fixes #1184
2013-11-25 15:34:17 +01:00
Klaas Freitag
a342f63fdf
Changed wording: Replaced Protocol against Status.
2013-11-20 14:27:44 +01:00
Daniel Molkentin
ead0f8d029
Update build docs
2013-11-14 12:36:09 +01:00
Klaas Freitag
c58e9d17a8
Again minor doc changes.
2013-11-07 10:29:27 +01:00
Klaas Freitag
41ccbc0334
Minor docu change.
2013-11-07 10:28:14 +01:00
Klaas Freitag
b6152c19d6
Adjust generic build documentation to the current state.
2013-11-06 11:13:55 +01:00
Andrea Sosso
083e75998f
Update mingw32-cross-nsis-plugin-processes and mingw32-cross-nsis-plugin-uac
2013-10-28 17:17:10 +01:00
Mathieu Arnold
2b652422b9
Don't call make directly, it can have another name.
2013-10-16 15:57:05 +02:00
hefee
2b1602872c
Don't ship doc/scripts/README.rst via sphinx
2013-09-13 01:26:02 +02:00
Daniel Molkentin
b488ad12c2
Do not build org and com theming when building from tar ball
...
Fixes #989
2013-09-12 12:56:24 +02:00
morriswinkler
751181d14f
Update building.rst
...
eider fix it or add the note here
2013-09-09 19:09:08 +02:00
Klaas Freitag
8fe102662d
Merge branch 'propagator-ng': Fixes to work with new LGPL ocsync.
...
Conflicts:
src/mirall/csyncthread.cpp
2013-09-04 16:33:06 +02:00
Klaas Freitag
b676ffe208
Some more info about the exclude matching.
2013-09-04 15:17:43 +02:00
Daniel Molkentin
da63b1223c
Doc: more polishing
...
- add description of syncing limitations
- update out-of-date comments
Fixes #788
2013-09-03 12:35:40 +02:00
Daniel Molkentin
063acadc3b
Doc: new interface chapter
2013-09-02 19:28:06 +02:00
Daniel Molkentin
5df6430bb2
Doc: Do not enforce theme when building without submodules
2013-09-02 15:55:03 +02:00
Daniel Molkentin
9a0096d07c
Docs: Allow to build with org and com branding
2013-09-02 14:01:15 +02:00
Klaas Freitag
98efab83a1
Compile against ocsync based on csync 0.50
2013-08-20 13:26:03 +02:00
hefee
066c0ba189
Make building documantation parallelable.
...
sphinx will fail in a race condition, if every sphinx target
uses the same CACHE dir:
Exception occurred:
File "/usr/lib/pymodules/python2.7/sphinx/cmdline.py", line 189, in main
app.build(force_all, filenames)
File "/usr/lib/pymodules/python2.7/sphinx/application.py", line 204, in build
self.builder.build_update()
File "/usr/lib/pymodules/python2.7/sphinx/builders/__init__.py", line 196, in build_update
'out of date' % len(to_build))
File "/usr/lib/pymodules/python2.7/sphinx/builders/__init__.py", line 238, in build
self.env.topickle(path.join(self.doctreedir, ENV_PICKLE_FILENAME))
File "/usr/lib/pymodules/python2.7/sphinx/environment.py", line 351, in topickle
movefile(filename + '.tmp', filename)
File "/usr/lib/pymodules/python2.7/sphinx/util/osutil.py", line 104, in movefile
os.rename(source, dest)
OSError: [Errno 2] No such file or directory
2013-08-15 02:36:44 +02:00
Daniel Molkentin
95d600c5f1
Fix proxy documentation, explain bandwidth limiter
2013-08-08 14:54:52 +02:00
Klaas Freitag
4e7c069c1f
Some adds to the architecture documentation.
2013-08-08 14:19:13 +02:00
Klaas Freitag
18f764e4d5
Fix a typo.
2013-08-02 21:55:09 +02:00
RealRancor
33d76962a7
Updated options with missing cl switches
2013-08-02 11:59:57 +02:00
Klaas Freitag
5da6103fb5
Documented the docexpire option.
2013-07-11 12:32:58 +02:00
Daniel Molkentin
a441b1d562
Bump year
2013-06-19 16:07:07 +02:00
Daniel Molkentin
6e2042cd55
Doc: Expand usage page
2013-06-19 16:04:48 +02:00
Daniel Molkentin
bb8b58dc66
Doc: more fixes on troubleshooting section
2013-06-19 15:48:04 +02:00
Daniel Molkentin
9cd099056b
Doc: More structure in troubleshooting.rst
2013-06-19 15:40:20 +02:00
Daniel Molkentin
0adbc032ae
Doc: Expand trouble shooting section
2013-06-19 15:40:15 +02:00
Daniel Molkentin
22a679fb8c
Doc: Add back --logfile, as it still exists
2013-06-19 15:40:09 +02:00
Daniel Molkentin
35a67fab0a
Doc: remove now meaningless scentences
2013-06-19 15:40:06 +02:00
Daniel Molkentin
fdc8117211
doc: Fix wording
2013-06-19 15:40:02 +02:00
Daniel Molkentin
24208e6137
Remove mirall man page
2013-06-19 15:39:56 +02:00
Daniel Molkentin
205502fd3b
Fix incorrect license attribution
...
Fixes #672
2013-06-10 07:42:35 +02:00
Daniel Molkentin
79785241ea
Docs: --logdir replaces --logfile
2013-06-05 14:57:32 +02:00
Daniel Molkentin
bd74dbbfc5
doc: markup fixes
2013-05-17 12:02:40 +02:00
Daniel Molkentin
a0599e75b7
Update build instructions for Mac OS
2013-05-17 11:42:19 +02:00
Klaas Freitag
b33b638d2d
A bit more verbose troubleshooting documentation.
2013-04-30 13:53:33 +02:00
Mario Enrico Ragucci
75448c41d4
Verified format cleanup (really...)
...
Signed-off-by: Mario Enrico Ragucci <github@ragucci.de>
2013-04-26 17:02:55 +02:00
Mario Enrico Ragucci
afc96e2021
Format cleanup
...
Signed-off-by: Mario Enrico Ragucci <github@ragucci.de>
2013-04-26 15:47:49 +02:00
Mario Enrico Ragucci
7e07d20d31
Remove LOG4C information as this is not needed anymore
...
Signed-off-by: Mario Enrico Ragucci <github@ragucci.de>
2013-04-26 13:32:35 +02:00
Mario Enrico Ragucci
1b5ed68375
Formatting cleanup
2013-04-26 01:00:50 +02:00
Mario Enrico Ragucci
ce996b3fc8
- Update Cross-Compiling section: Listing of all needed libraries to successfully build the Windows installer package
...
- Adding a note about the missing cross-compiled LOG4C package
- Minor changes to the documentation to be more specific about building the Windows package
2013-04-26 00:45:19 +02:00
hefee
25a3ceb94d
adding WITH_DOC parameter to cmake
...
Fixes #412
2013-03-11 16:18:20 +01:00
Klaas Freitag
d3f51c611f
Some more troubleshooting details.
2013-03-06 08:51:04 +01:00
Daniel Molkentin
e2e14f2184
Do not install docs on OS X
2013-02-21 15:26:31 +01:00
Klaas Freitag
58a5405343
Dont do the doc build step on every build.
2013-02-21 14:01:16 +01:00
Daniel Molkentin
7ba8a55fa5
Merge pull request #313 from hefee/doc2default
...
creating doc to default target
2013-02-12 11:48:00 -08:00
hefee
17901e7bc7
fixing typo in mirall.1.rst
2013-02-09 12:28:43 +01:00
hefee
0ea16c04cc
moving description of config file and client optinos to own files.
...
* split usage to three files: usage, conffile, options
* fixing minor typos in mirall.1.rst and owncloud1.rst
* owncloud.1 uses include conffile, options
* mirall.1 uses include conffile, options
* Fixes : #183
2013-02-09 12:23:32 +01:00
hefee
e1f404a011
adding maclocation
2013-02-09 10:30:56 +01:00
hefee
69715d2182
merging from owncloud/master
2013-02-09 10:16:38 +01:00
hefee
0285213140
removing asciidoc, now creating manpages via sphinx again
2013-02-09 10:10:23 +01:00
hefee
1a907f23f0
moving generation of manpages to sphinx
...
--HG--
rename : doc/mirall.1.txt => doc/mirall.1.rst
rename : doc/owncloud.1.txt => doc/owncloud.1.rst
2013-02-09 10:05:45 +01:00
hefee
0ebcdbbb3f
no more different cmake parameter is needed
2013-02-08 18:57:25 +01:00
LukeOwncloud
a617a04295
Update doc/usage.rst
2013-02-07 08:50:49 +01:00
hefee
1f4ea2c60e
only add instalation dir if we are creating doc
2013-02-04 18:31:48 +01:00
hefee
edb4ff6b98
adding doc to default if CREATEDOC is set
2013-02-04 18:10:51 +01:00
Sandro Knauß
279bb47ab4
add creating manpages to CMakeLists
2013-02-04 17:36:56 +01:00
Sandro Knauß
7ef92748ea
adding manpages for mirall and owncloud
2013-02-04 16:56:39 +01:00
Sandro Knauß
0e6e614318
adding --monoicons option to usage.rst
2013-02-04 16:55:50 +01:00
Klaas Freitag
4ea4c70443
Minor: Fixed a typo.
2013-01-23 10:57:45 +01:00
Klaas Freitag
1385aab65d
Changed FindCSync module to not check relative pathes + docu.
2013-01-22 15:08:56 +01:00
Daniel Molkentin
5e3f2cf25a
Remove legacy configuration options.
...
They were not used anyway.
2013-01-16 18:03:40 +01:00
Daniel Molkentin
5c495265f4
Consolidate theming support.
...
This implements out-of-repository-theming, and removes the old
custom.ini theming that never worked on all platforms and had
no straight deployment story.
The new approach requires the CMAKE variable OEM_THEME_DIR to
point to a directory that must at least contain an OEM.cmake file
(check OWNCLOUD.cmake for possible options) as well as a themes.qrc
and a themes/ directory that directly correspond to the ones in
the source tree.
2013-01-10 17:16:59 +01:00
Daniel Molkentin
08ab13dc4b
Doc: More missing packages
2012-12-14 21:11:19 +01:00
Daniel Molkentin
aac9b770fc
Details on windows builds
2012-12-14 20:42:59 +01:00
Daniel Molkentin
53aea61184
doc: Fix PDF generation here, too
2012-11-29 12:25:32 +01:00
Klaas Freitag
bf2181f111
Minor doc fix.
2012-11-27 15:46:17 +01:00
Daniel Molkentin
271d4fa22e
Show last updated timestamp
2012-11-25 02:07:12 +01:00
Daniel Molkentin
a3a0202752
Fix copy/paste error
2012-11-25 01:20:25 +01:00
Daniel Molkentin
0da93f3eb5
Remove doc from the default target
...
The doc target requires strict parallel execution. Make it
a separate target unless we figure out how to do this with cmake.
2012-11-25 01:00:21 +01:00
Daniel Molkentin
78c7dc95a0
Add doc cmake targets (HTML, PDF, QtHelp, CHM, man)
...
make doc will build all of the above, except for CHM,
which needs manual preparation and can be built with
make doc-chm. See doc/scripts/README.rst for details.
We do our best to ensure to detect the required tools
before adding targets, so a build should always succeed.
Exception: On Debian and Ubuntu, the following packages are
required to build the PDF target (in addition to pdflatex
itself, which is autodetected):
* texlive-latex-recommended
* texlive-latex-extra
* texlive-fonts-recommended
If pdflatex is present, but those are not, the doc target
will fail.
Results can be found in $BUILDDIR/doc/$format.
2012-11-25 00:38:47 +01:00
Daniel Molkentin
f607cf55c6
doc: Make fit for use with make latexpdf
2012-11-24 02:35:18 +01:00
Daniel Molkentin
da64639f39
Update doc/building.rst
...
move packages into correct section
2012-11-21 15:20:15 +01:00
Daniel Molkentin
faa0f06fe3
Improve building section based on user feedback
2012-11-21 14:57:40 +01:00
Daniel Molkentin
9b8b656720
doc: Add Qt dependency to build instructions
2012-11-19 18:49:10 +01:00
Daniel Molkentin
8c9f8bdb6d
doc: Fix build instructions; hint make package
2012-11-19 18:15:25 +01:00
Daniel Molkentin
ba9a07c2f2
Upate build docs
2012-11-15 14:42:10 +01:00
Daniel Molkentin
df219dd09b
Doc: use correct cmake vars
2012-11-05 14:44:10 +01:00
Daniel Molkentin
80ecd71fc7
Doc: more trouble shooting
2012-11-05 11:36:48 +01:00
Daniel Molkentin
7d6eb61f1b
doc: wording
2012-11-04 00:46:02 +01:00
Daniel Molkentin
3a165ad654
Doc: add troubleshooting section
2012-11-02 16:26:56 +01:00
Daniel Molkentin
06e7864174
Doc: Require sphinx todo extension
2012-11-01 19:10:51 +01:00
Daniel Molkentin
8b60726a48
Doc: Introduce chapter on Architecture, Glossary
2012-11-01 19:10:01 +01:00
Daniel Molkentin
855597bfd9
Doc: formatting
2012-11-01 17:24:25 +01:00
Daniel Molkentin
827a31fa02
doc: formatting fix
2012-11-01 17:03:58 +01:00
Daniel Molkentin
20f04ec6d9
doc: small improvements
2012-11-01 16:52:07 +01:00
Daniel Molkentin
83180310af
doc: add chapter on (soft-)branding
2012-11-01 16:33:27 +01:00
Daniel Molkentin
9feb9b5262
Doc: fix typo
2012-10-31 17:22:03 +01:00
Daniel Molkentin
f2cfabcdb8
Doc: improve build instructions
2012-10-31 15:19:00 +01:00
Daniel Molkentin
6b2be97c22
Docs: add build chapter
2012-10-31 14:44:59 +01:00
Daniel Molkentin
6b0abed4ee
Remove file checked-in by accident
2012-10-27 19:30:37 +02:00
Daniel Molkentin
bf8b9246fe
Add docs
2012-10-27 17:05:01 +02:00
