diff options
author | Tim Jenssen <tim.jenssen@digia.com> | 2013-05-17 10:25:22 +0200 |
---|---|---|
committer | Tim Jenssen <tim.jenssen@digia.com> | 2013-05-17 10:26:49 +0200 |
commit | 07d7d00f5dabb008cfb8f245314734eb770d11d6 (patch) | |
tree | 6734eb1f0ce64a73f16761ba52873d9fd47f2356 /doc | |
parent | 06449248ab638d3ebb23f03e56450f10b4acbb5c (diff) | |
parent | d54178d4899af6a97005dce3cf5e18eb08589e40 (diff) |
Merge remote-tracking branch 'origin/1.3' into merge
Change-Id: I2ef155784d34a250c0adc878208b86da0ab2e5d2
Diffstat (limited to 'doc')
-rw-r--r-- | doc/installerfw.qdoc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/installerfw.qdoc b/doc/installerfw.qdoc index b637ba675..b5b08dc6e 100644 --- a/doc/installerfw.qdoc +++ b/doc/installerfw.qdoc @@ -805,6 +805,7 @@ \o Enabled, with 0 disabling this repository. \o Username, which is used as user on a protected repository. \o Password, which sets the password to use on a protected repository. + \o DisplayName, which optionally sets a String to display instead of the URL. \endlist @@ -814,10 +815,11 @@ \code <RemoteRepositories> <Repository> - <Url>http://www.yourcompany.com/packages</Url> + <Url>http://www.example.com/packages</Url> <Enabled>1</Enabled> <Username>user</Username> <Password>password</Password> + <DisplayName>Example repository</DisplayName> </Repository> </RemoteRepositories> \endcode |