String changes

manual/custom.py

@@ -104,7 +104,7 @@ are two ways to do that:
 
     * If you plan to connect only to a server running on the same computer,
       you can simply use the ``--enable-local-write`` option of the
-      content server, to allow any program, including calibredb, running on
+      Content server, to allow any program, including calibredb, running on
       the local computer to make changes to your calibre data. When running
       the server from the main calibre program, this option is in
       :guilabel:`Preferences->Sharing over the net->Advanced`.

manual/faq.rst

@@ -196,7 +196,7 @@ We just need some information from you:
 
 Once you send us the output for a particular operating system, support for the device in that operating system
 will appear in the next release of calibre. To send us the output, open a bug report and attach the output to it.
-See `calibre bugs <https://calibre-ebook.com/bugs>`_.
+See `how to report bugs <https://calibre-ebook.com/bugs>`_.
 
 My device is not being detected by calibre?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -376,7 +376,7 @@ you may not be able to run the server on a port number less than 1024 because of
 this case the simplest solution is to adjust your router to forward requests on port 80 to port 8080).
 
 Also some devices do not have browsers advanced enough to run the app-like
-interface used by the content server. For such devices, you can simply add
+interface used by the Content server. For such devices, you can simply add
 ``/mobile`` to the server URL to get a simplified, non-JavaScript interface.
 
 

manual/server.rst

@@ -140,7 +140,7 @@ is as follows.
      found in the first step.
 
 .. note::
-    For maximum security, you should also enable HTTPS on the content server.
+    For maximum security, you should also enable HTTPS on the Content server.
     You can either do so directly in the server by providing the path to
     the HTTPS certificate to use in the advanced configuration options for
     the server, or you can setup a reverse proxy as described below, to use
@@ -362,7 +362,7 @@ based Linux system. Just create the file
 ``/etc/systemd/system/calibre-server.service`` with the contents shown below::
 
     [Unit]
-    Description=calibre content server
+    Description=calibre Content server
     After=network.target
 
     [Service]

manual/virtual_libraries.rst

@@ -106,7 +106,7 @@ example, ``vl:Read`` will find all the books in the *Read* Virtual library. The
 The value following ``vl:`` must be the name of a Virtual library. If the Virtual library name
 contains spaces then surround it with quotes.
 
-One use for a Virtual library search is in the content server. In
+One use for a Virtual library search is in the Content server. In
 :guilabel:`Preferences->Sharing over the net->Require username and password` you
 can limit the calibre libraries visible to a user. For each visible library you
 can specify a search expression to further limit which books are seen. Use

src/calibre/db/cli/main.py

@@ -158,7 +158,7 @@ class DBCtx(object):
                     'Another calibre program such as {} or the main calibre program is running.'
                     ' Having multiple programs that can make changes to a calibre library'
                     ' running at the same time is a bad idea. calibredb can connect directly'
-                    ' to a running calibre content server, to make changes through it, instead.'
+                    ' to a running calibre Content server, to make changes through it, instead.'
                     ' See the documentation of the {} option for details.'
                 ).format('calibre-server' + ext, '--with-library')
                 )

src/calibre/gui2/preferences/server.py

@@ -319,7 +319,7 @@ class MainTab(QWidget):  # {{{
         fl.addRow(options['port'].shortdoc + ':', sb)
         l.addSpacing(25)
         self.opt_auth = cb = QCheckBox(
-            _('Require &username and password to access the content server')
+            _('Require &username and password to access the Content server')
         )
         l.addWidget(cb)
         self.auth_desc = la = QLabel(self)
@@ -1374,7 +1374,7 @@ class ConfigWidget(ConfigWidgetBase):
                     _('No users specified'),
                     _(
                         'You have turned on the setting to require passwords to access'
-                        ' the content server, but you have not created any user accounts.'
+                        ' the Content server, but you have not created any user accounts.'
                         ' Create at least one user account in the "User accounts" tab to proceed.'
                     ),
                     show=True

src/calibre/gui2/ui.py

@@ -488,7 +488,7 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin,  # {{{
                 except EnvironmentError:
                     pass
                 warning_dialog(self, _('Content server changed!'), _(
-                    'calibre 3 comes with a completely re-written content server.'
+                    'calibre 3 comes with a completely re-written Content server.'
                     ' As such any custom configuration you have for the content'
                     ' server no longer applies. You should check and refresh your'
                     ' settings in Preferences->Sharing->Sharing over the net'), show=True)