← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to doc/developers/authentication-ring.txt

  • Committer: John Arbash Meinel
  • Date: 2009-12-02 23:09:40 UTC
  • mfrom: (4853.1.1 whitespace)
  • mto: This revision was merged to the branch mainline in revision 4856.
  • Revision ID: john@arbash-meinel.com-20091202230940-7n2aydoxngdqxzld
Strip trailing whitespace from doc files by Patrick Regan.

Resolve one small conflict with another doc edit.
Also, revert the changes to all the .pdf and .png files. We shouldn't
be touching them as they are pure-binary files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/developers/authentication-ring.txt
88
88
really needed is (``user``, ``password``, ``host``, ``path``). The ``realm``
89
89
can be ignored [#ignored_realm]_ as long as it is still presented to the user
90
90
when prompting for the password (unless someone found a way to declare two
91
 
different realms for the same path). 
 
91
different realms for the same path).
92
92
 
93
93
``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly
94
94
specifying the appropriate port.
260
260
        host=r.hobby.net
261
261
        user=jim
262
262
        password=obvious1234
263
 
        
 
263
 
264
264
        # Home server
265
265
        [home]
266
266
        scheme=https
269
269
        password='c2VjcmV0LXBhc3M='
270
270
        password_encoding=base64
271
271
        verify_certificates=no # Still searching a free certificate provider
272
 
        
 
272
 
273
273
        [DEFAULT]
274
274
        # Our local user is barbaz, on all remote sites we're known as foobar
275
275
        user=foobar
276
 
        
 
276
 
277
277
  * an HTTP server and a proxy::
278
278
 
279
279
        # development branches on dev server
283
283
        path=/dev
284
284
        user=user1
285
285
        password=pass1
286
 
        
 
286
 
287
287
        # toy branches
288
288
        [localhost]
289
289
        scheme=http
291
291
        path=/
292
292
        user=user2
293
293
        password=pass2
294
 
        
 
294
 
295
295
        # proxy
296
296
        [proxy]
297
297
        scheme=http