From 267df9e82c5b4247076301b8455a239d8b0bc447 Mon Sep 17 00:00:00 2001
From: Peter Collins <pecolli@microsoft.com>
Date: Tue, 11 Oct 2022 13:09:29 -0400
Subject: [PATCH] Bump to xamarin/xamarin-android@2c7d72d2

Notable documentation related generator changes:

  * xamarin/java.interop@e1ee4b1c: [Java.Interop.Tools.JavaSource] Parse {@param} tags
  * xamarin/java.interop@07c95e96: [Java.Interop.Tools.JavaSource] Parse <code/> tags

Changes in xamarin-android and java.interop:

  * https://github.com/xamarin/xamarin-android/compare/ca8f5617cc55cc3510a61433d8d50c6a58ec0ac2...2c7d72d2471d98ca0da910189b8ca849658a8561
  * https://github.com/xamarin/java.interop/compare/a0728ed5b4e2eb91c2c8048b70c221f19c4b6474...e1ee4b1c3731295d80cfa7de418e0edd06ccd98a
---
 ...essibilityGestureEvent+InterfaceConsts.xml |   6 +-
 ...cessibilityServiceInfo+InterfaceConsts.xml |   6 +-
 .../Account+InterfaceConsts.xml               |   6 +-
 ...tAuthenticatorResponse+InterfaceConsts.xml |   6 +-
 ...thenticatorDescription+InterfaceConsts.xml |   6 +-
 .../en/Android.Animation/Animator.xml         |   4 +-
 .../Android.Animation/AnimatorSet+Builder.xml |   4 +-
 .../BidirectionalTypeConverter.xml            |   2 +-
 .../Android.Animation/FloatArrayEvaluator.xml |   8 +-
 .../en/Android.Animation/FloatEvaluator.xml   |  12 +-
 .../en/Android.Animation/ITypeEvaluator.xml   |   4 +-
 .../Android.Animation/IntArrayEvaluator.xml   |   8 +-
 .../en/Android.Animation/IntEvaluator.xml     |  12 +-
 .../en/Android.Animation/LayoutTransition.xml |   2 +-
 .../en/Android.Animation/ObjectAnimator.xml   | 100 +--
 .../en/Android.Animation/PointFEvaluator.xml  |   8 +-
 .../PropertyValuesHolder.xml                  |   8 +-
 .../en/Android.Animation/RectEvaluator.xml    |   8 +-
 .../TimeAnimator+ITimeListener.xml            |   2 +-
 .../en/Android.Animation/TypeConverter.xml    |   2 +-
 .../ValueAnimator+IAnimatorUpdateListener.xml |   4 +-
 .../en/Android.Animation/ValueAnimator.xml    |  14 +-
 .../DeviceAdminInfo+InterfaceConsts.xml       |   6 +-
 .../Android.App.Admin/DevicePolicyManager.xml |   3 +-
 ...yResetProtectionPolicy+InterfaceConsts.xml |   6 +-
 .../NetworkEvent+InterfaceConsts.xml          |   6 +-
 ...urityLog+SecurityEvent+InterfaceConsts.xml |   6 +-
 .../SystemUpdateInfo+InterfaceConsts.xml      |   6 +-
 .../SystemUpdatePolicy+InterfaceConsts.xml    |   6 +-
 ...idationFailedException+InterfaceConsts.xml |   6 +-
 .../UnsafeStateException+InterfaceConsts.xml  |   6 +-
 .../AssistContent+InterfaceConsts.xml         |   6 +-
 .../AssistStructure+InterfaceConsts.xml       |   6 +-
 .../en/Android.App.Backup/BackupAgent.xml     |   8 +-
 .../en/Android.App.Backup/BackupDataInput.xml |   5 +-
 .../Android.App.Backup/FileBackupHelper.xml   |   4 +-
 .../en/Android.App.Backup/IBackupHelper.xml   |  10 +-
 .../BlobHandle+InterfaceConsts.xml            |   6 +-
 .../JobInfo+InterfaceConsts.xml               |   6 +-
 ...Info+TriggerContentUri+InterfaceConsts.xml |   6 +-
 .../JobParameters+InterfaceConsts.xml         |   6 +-
 .../JobWorkItem+InterfaceConsts.xml           |   6 +-
 .../ConversationStatus+InterfaceConsts.xml    |   6 +-
 .../Slice+InterfaceConsts.xml                 |   6 +-
 .../SliceItem+InterfaceConsts.xml             |   6 +-
 .../SliceSpec+InterfaceConsts.xml             |   6 +-
 .../ConfigurationStats+InterfaceConsts.xml    |   6 +-
 .../EventStats+InterfaceConsts.xml            |   6 +-
 .../ExternalStorageStats+InterfaceConsts.xml  |   6 +-
 .../StorageStats+InterfaceConsts.xml          |   6 +-
 .../UsageEvents+InterfaceConsts.xml           |   6 +-
 .../UsageStats+InterfaceConsts.xml            |   6 +-
 docs/Mono.Android/en/Android.App/Activity.xml |  34 +-
 ...vityManager+MemoryInfo+InterfaceConsts.xml |   6 +-
 ...+ProcessErrorStateInfo+InterfaceConsts.xml |   6 +-
 ...Manager+RecentTaskInfo+InterfaceConsts.xml |   6 +-
 ...+RunningAppProcessInfo+InterfaceConsts.xml |   6 +-
 ...ger+RunningServiceInfo+InterfaceConsts.xml |   6 +-
 ...anager+RunningTaskInfo+InterfaceConsts.xml |   6 +-
 ...anager+TaskDescription+InterfaceConsts.xml |   6 +-
 ...Manager+AlarmClockInfo+InterfaceConsts.xml |   6 +-
 ...ApplicationErrorReport+InterfaceConsts.xml |   6 +-
 .../ApplicationExitInfo+InterfaceConsts.xml   |   6 +-
 .../en/Android.App/ApplicationExitInfo.xml    |   2 +-
 .../AsyncNotedAppOp+InterfaceConsts.xml       |   6 +-
 ...ationRequiredException+InterfaceConsts.xml |   6 +-
 .../AutomaticZenRule+InterfaceConsts.xml      |   6 +-
 ...artNotAllowedException+InterfaceConsts.xml |   6 +-
 .../DirectAction+InterfaceConsts.xml          |   6 +-
 ...artNotAllowedException+InterfaceConsts.xml |   6 +-
 .../Fragment+SavedState+InterfaceConsts.xml   |   6 +-
 docs/Mono.Android/en/Android.App/Fragment.xml |   8 +-
 .../Notification+Action+InterfaceConsts.xml   |   6 +-
 ...ication+BubbleMetadata+InterfaceConsts.xml |   6 +-
 .../Notification+InterfaceConsts.xml          |   6 +-
 .../en/Android.App/Notification.xml           |   2 +-
 .../NotificationChannel+InterfaceConsts.xml   |   6 +-
 ...tificationChannelGroup+InterfaceConsts.xml |   6 +-
 ...ficationManager+Policy+InterfaceConsts.xml |   6 +-
 .../PendingIntent+InterfaceConsts.xml         |   6 +-
 .../en/Android.App/Person+InterfaceConsts.xml |   6 +-
 ...PictureInPictureParams+InterfaceConsts.xml |   6 +-
 ...ictureInPictureUiState+InterfaceConsts.xml |   6 +-
 ...rableSecurityException+InterfaceConsts.xml |   6 +-
 .../RemoteAction+InterfaceConsts.xml          |   6 +-
 .../RemoteInput+InterfaceConsts.xml           |   6 +-
 .../en/Android.App/SearchManager.xml          |   4 +-
 .../SearchableInfo+InterfaceConsts.xml        |   6 +-
 .../SyncNotedAppOp+InterfaceConsts.xml        |   6 +-
 .../en/Android.App/UiAutomation.xml           |   2 +-
 ...ckOptionRequest+Option+InterfaceConsts.xml |   6 +-
 ...VoiceInteractor+Prompt+InterfaceConsts.xml |   6 +-
 .../WallpaperColors+InterfaceConsts.xml       |   6 +-
 .../WallpaperInfo+InterfaceConsts.xml         |   6 +-
 .../AppWidgetProviderInfo+InterfaceConsts.xml |   6 +-
 .../AdvertiseData+InterfaceConsts.xml         |   6 +-
 .../AdvertiseSettings+InterfaceConsts.xml     |   6 +-
 ...vertisingSetParameters+InterfaceConsts.xml |   6 +-
 ...cAdvertisingParameters+InterfaceConsts.xml |   6 +-
 .../ScanFilter+InterfaceConsts.xml            |   6 +-
 .../ScanResult+InterfaceConsts.xml            |   6 +-
 .../ScanSettings+InterfaceConsts.xml          |   6 +-
 .../BluetoothClass+InterfaceConsts.xml        |   6 +-
 .../BluetoothDevice+InterfaceConsts.xml       |   6 +-
 ...oothGattCharacteristic+InterfaceConsts.xml |   6 +-
 ...luetoothGattDescriptor+InterfaceConsts.xml |   6 +-
 .../BluetoothGattService+InterfaceConsts.xml  |   6 +-
 ...HealthAppConfiguration+InterfaceConsts.xml |   6 +-
 .../BluetoothHidDevice+Callback.xml           |   5 +-
 ...idDeviceAppQosSettings+InterfaceConsts.xml |   6 +-
 ...idDeviceAppSdpSettings+InterfaceConsts.xml |   6 +-
 .../AssociationRequest+InterfaceConsts.xml    |   6 +-
 ...nVerificationUserState+InterfaceConsts.xml |   6 +-
 .../ActivityInfo+InterfaceConsts.xml          |   6 +-
 .../en/Android.Content.PM/ActivityInfo.xml    |   2 +-
 .../ApkChecksum+InterfaceConsts.xml           |   6 +-
 .../ApplicationInfo+InterfaceConsts.xml       |   6 +-
 .../Attribution+InterfaceConsts.xml           |   6 +-
 .../ChangedPackages+InterfaceConsts.xml       |   6 +-
 .../Checksum+InterfaceConsts.xml              |   6 +-
 .../ConfigurationInfo+InterfaceConsts.xml     |   6 +-
 .../FeatureGroupInfo+InterfaceConsts.xml      |   6 +-
 .../FeatureInfo+InterfaceConsts.xml           |   6 +-
 .../InstallSourceInfo+InterfaceConsts.xml     |   6 +-
 .../InstrumentationInfo+InterfaceConsts.xml   |   6 +-
 ...herApps+PinItemRequest+InterfaceConsts.xml |   6 +-
 .../ModuleInfo+InterfaceConsts.xml            |   6 +-
 .../PackageInfo+InterfaceConsts.xml           |   6 +-
 ...eInstaller+SessionInfo+InterfaceConsts.xml |   6 +-
 ...nstaller+SessionParams+InterfaceConsts.xml |   6 +-
 ...ackageManager+Property+InterfaceConsts.xml |   6 +-
 .../en/Android.Content.PM/PackageManager.xml  |   2 +-
 .../PackageStats+InterfaceConsts.xml          |   6 +-
 .../PermissionGroupInfo+InterfaceConsts.xml   |   6 +-
 .../PermissionGroupInfo.xml                   |   2 +-
 .../PermissionInfo+InterfaceConsts.xml        |   6 +-
 .../en/Android.Content.PM/PermissionInfo.xml  |  10 +-
 .../ProviderInfo+InterfaceConsts.xml          |   6 +-
 .../ResolveInfo+InterfaceConsts.xml           |   6 +-
 .../ServiceInfo+InterfaceConsts.xml           |   6 +-
 .../en/Android.Content.PM/ServiceInfo.xml     |  10 +-
 .../SharedLibraryInfo+InterfaceConsts.xml     |   6 +-
 .../ShortcutInfo+InterfaceConsts.xml          |   6 +-
 .../en/Android.Content.PM/ShortcutManager.xml |   5 +-
 .../Signature+InterfaceConsts.xml             |   6 +-
 .../SigningInfo+InterfaceConsts.xml           |   6 +-
 .../VersionedPackage+InterfaceConsts.xml      |   6 +-
 .../AssetFileDescriptor+InterfaceConsts.xml   |   6 +-
 .../AssetFileDescriptor.xml                   |   2 +-
 .../ColorStateList+InterfaceConsts.xml        |   6 +-
 .../Configuration+InterfaceConsts.xml         |   6 +-
 .../ObbInfo+InterfaceConsts.xml               |   6 +-
 .../AttributionSource+InterfaceConsts.xml     |   6 +-
 .../ClipData+InterfaceConsts.xml              |   6 +-
 .../ClipDescription+InterfaceConsts.xml       |   6 +-
 .../ComponentName+InterfaceConsts.xml         |   6 +-
 ...ntentProviderOperation+InterfaceConsts.xml |   6 +-
 .../ContentProviderResult+InterfaceConsts.xml |   6 +-
 .../en/Android.Content/ContentResolver.xml    |  16 +-
 .../ContentValues+InterfaceConsts.xml         |   6 +-
 .../en/Android.Content/Context.xml            |   2 +-
 .../Intent+InterfaceConsts.xml                |   6 +-
 ...t+ShortcutIconResource+InterfaceConsts.xml |   6 +-
 .../en/Android.Content/Intent.xml             |   2 +-
 .../IntentFilter+InterfaceConsts.xml          |   6 +-
 .../IntentSender+InterfaceConsts.xml          |   6 +-
 .../LocusId+InterfaceConsts.xml               |   6 +-
 .../PeriodicSync+InterfaceConsts.xml          |   6 +-
 .../RestrictionEntry+InterfaceConsts.xml      |   6 +-
 .../SyncAdapterType+InterfaceConsts.xml       |   6 +-
 .../SyncInfo+InterfaceConsts.xml              |   6 +-
 .../Android.Content/SyncRequest+Builder.xml   |   2 +-
 .../SyncRequest+InterfaceConsts.xml           |   6 +-
 .../SyncResult+InterfaceConsts.xml            |   6 +-
 .../SyncStats+InterfaceConsts.xml             |   6 +-
 .../UriPermission+InterfaceConsts.xml         |   6 +-
 .../SQLiteDatabase.xml                        |  44 +-
 .../CursorWindow+InterfaceConsts.xml          |   6 +-
 .../en/Android.Database/CursorWindow.xml      |  20 +-
 .../en/Android.Database/ICursor.xml           |   6 +-
 .../en/Android.Drm/DrmConvertedStatus.xml     |   2 +-
 .../en/Android.Drm/DrmErrorEvent.xml          |   4 +-
 docs/Mono.Android/en/Android.Drm/DrmEvent.xml |   8 +-
 docs/Mono.Android/en/Android.Drm/DrmInfo.xml  |   8 +-
 .../en/Android.Drm/DrmInfoEvent.xml           |   4 +-
 .../en/Android.Drm/DrmInfoRequest.xml         |   6 +-
 .../en/Android.Drm/DrmInfoStatus.xml          |   2 +-
 .../DrmManagerClient+IOnErrorListener.xml     |   2 +-
 .../DrmManagerClient+IOnEventListener.xml     |   2 +-
 .../DrmManagerClient+IOnInfoListener.xml      |   2 +-
 .../en/Android.Drm/DrmManagerClient.xml       |  20 +-
 .../Mono.Android/en/Android.Drm/DrmRights.xml |  20 +-
 .../Gesture+InterfaceConsts.xml               |   6 +-
 .../AdaptiveIconDrawable.xml                  |   2 +-
 .../Icon+InterfaceConsts.xml                  |   6 +-
 .../en/Android.Graphics.Drawables/Icon.xml    |   4 +-
 .../Bitmap+InterfaceConsts.xml                |   6 +-
 .../BitmapFactory+Options.xml                 |   3 +-
 .../en/Android.Graphics/Canvas.xml            |   2 +-
 .../en/Android.Graphics/ColorObject.xml       |  16 +-
 .../Insets+InterfaceConsts.xml                |   6 +-
 .../ParcelableColorSpace+InterfaceConsts.xml  |   6 +-
 .../Mono.Android/en/Android.Graphics/Path.xml |   2 +-
 .../Point+InterfaceConsts.xml                 |   6 +-
 .../PointF+InterfaceConsts.xml                |   6 +-
 .../Android.Graphics/Rect+InterfaceConsts.xml |   6 +-
 .../RectF+InterfaceConsts.xml                 |   6 +-
 .../Region+InterfaceConsts.xml                |   6 +-
 .../en/Android.Graphics/RenderEffect.xml      |   6 +-
 .../OutputConfiguration+InterfaceConsts.xml   |   6 +-
 .../SessionConfiguration+InterfaceConsts.xml  |   6 +-
 .../CameraAccessException.xml                 |   3 +-
 .../CameraMetadata.xml                        |   2 +-
 .../CaptureRequest+InterfaceConsts.xml        |   6 +-
 .../DeviceProductInfo+InterfaceConsts.xml     |   6 +-
 .../Light+InterfaceConsts.xml                 |   6 +-
 .../LightState+InterfaceConsts.xml            |   6 +-
 .../UsbAccessory+InterfaceConsts.xml          |   6 +-
 .../UsbConfiguration+InterfaceConsts.xml      |   6 +-
 .../UsbDevice+InterfaceConsts.xml             |   6 +-
 .../UsbEndpoint+InterfaceConsts.xml           |   6 +-
 .../UsbInterface+InterfaceConsts.xml          |   6 +-
 .../HardwareBuffer+InterfaceConsts.xml        |   6 +-
 .../en/Android.Hardware/HardwareBuffer.xml    |   4 +-
 .../en/Android.Hardware/Sensor.xml            |  12 +-
 .../Android.Hardware/SensorDirectChannel.xml  |   3 +-
 .../en/Android.Hardware/SensorManager.xml     |  30 +-
 .../ProviderProperties+InterfaceConsts.xml    |   6 +-
 .../Address+InterfaceConsts.xml               |   6 +-
 .../Criteria+InterfaceConsts.xml              |   6 +-
 .../GnssAntennaInfo+InterfaceConsts.xml       |   6 +-
 ...Info+PhaseCenterOffset+InterfaceConsts.xml |   6 +-
 ...o+SphericalCorrections+InterfaceConsts.xml |   6 +-
 .../GnssCapabilities+InterfaceConsts.xml      |   6 +-
 .../GnssClock+InterfaceConsts.xml             |   6 +-
 .../GnssMeasurement+InterfaceConsts.xml       |   6 +-
 ...GnssMeasurementRequest+InterfaceConsts.xml |   6 +-
 .../GnssMeasurementsEvent+InterfaceConsts.xml |   6 +-
 .../GnssNavigationMessage+InterfaceConsts.xml |   6 +-
 .../GnssStatus+InterfaceConsts.xml            |   6 +-
 .../Location+InterfaceConsts.xml              |   6 +-
 .../LocationRequest+InterfaceConsts.xml       |   6 +-
 .../en/Android.Media.Audiofx/Virtualizer.xml  |   8 +-
 ...MediaBrowser+MediaItem+InterfaceConsts.xml |   6 +-
 .../NetworkEvent+InterfaceConsts.xml          |   6 +-
 .../PlaybackErrorEvent+InterfaceConsts.xml    |   6 +-
 .../PlaybackMetrics+InterfaceConsts.xml       |   6 +-
 .../PlaybackStateEvent+InterfaceConsts.xml    |   6 +-
 .../TrackChangeEvent+InterfaceConsts.xml      |   6 +-
 .../MidiDeviceInfo+InterfaceConsts.xml        |   6 +-
 .../MidiDeviceStatus+InterfaceConsts.xml      |   6 +-
 ...ontroller+PlaybackInfo+InterfaceConsts.xml |   6 +-
 ...MediaSession+QueueItem+InterfaceConsts.xml |   6 +-
 .../MediaSession+Token+InterfaceConsts.xml    |   6 +-
 ...backState+CustomAction+InterfaceConsts.xml |   6 +-
 .../PlaybackState+InterfaceConsts.xml         |   6 +-
 .../TvInputInfo+InterfaceConsts.xml           |   6 +-
 .../TvInputManager+TvInputCallback.xml        |   2 +-
 .../en/Android.Media.TV/TvInputManager.xml    |   6 +-
 .../TvTrackInfo+InterfaceConsts.xml           |   6 +-
 .../ApplicationMediaCapabilities+Builder.xml  |   2 +-
 ...ationMediaCapabilities+InterfaceConsts.xml |   6 +-
 .../AudioAttributes+InterfaceConsts.xml       |   6 +-
 .../en/Android.Media/AudioDeviceInfo.xml      |   4 +-
 .../AudioFormat+InterfaceConsts.xml           |   6 +-
 .../en/Android.Media/AudioManager.xml         |   7 +-
 ...oPlaybackConfiguration+InterfaceConsts.xml |   6 +-
 .../en/Android.Media/AudioRecord+Builder.xml  |   2 +-
 .../en/Android.Media/AudioRecord.xml          |   8 +-
 ...RecordingConfiguration+InterfaceConsts.xml |   6 +-
 .../en/Android.Media/AudioTrack+Builder.xml   |   2 +-
 .../en/Android.Media/AudioTrack.xml           |  56 +-
 .../MediaDescription+InterfaceConsts.xml      |   6 +-
 .../en/Android.Media/MediaExtractor.xml       |   8 +-
 .../MediaMetadata+InterfaceConsts.xml         |   6 +-
 .../MediaPlayer+IOnErrorListener.xml          |   2 +-
 .../MediaPlayer+IOnInfoListener.xml           |   4 +-
 .../MediaPlayer+TrackInfo+InterfaceConsts.xml |   6 +-
 .../en/Android.Media/MediaPlayer.xml          |   2 +-
 .../MediaRoute2Info+InterfaceConsts.xml       |   6 +-
 .../MediaSyncEvent+InterfaceConsts.xml        |   6 +-
 .../PlaybackParams+InterfaceConsts.xml        |   6 +-
 .../en/Android.Media/PlaybackParams.xml       |   8 +-
 .../Android.Media/Rating+InterfaceConsts.xml  |   6 +-
 ...uteDiscoveryPreference+InterfaceConsts.xml |   6 +-
 .../RoutingSessionInfo+InterfaceConsts.xml    |   6 +-
 .../Session2Command+InterfaceConsts.xml       |   6 +-
 .../Session2CommandGroup+InterfaceConsts.xml  |   6 +-
 .../Session2Token+InterfaceConsts.xml         |   6 +-
 .../en/Android.Media/SyncParams.xml           |  10 +-
 ...meShaper+Configuration+InterfaceConsts.xml |   6 +-
 ...VolumeShaper+Operation+InterfaceConsts.xml |   6 +-
 .../NsdServiceInfo+InterfaceConsts.xml        |   6 +-
 .../SipProfile+InterfaceConsts.xml            |   6 +-
 .../VcnConfig+InterfaceConsts.xml             |   6 +-
 .../AwareResources+InterfaceConsts.xml        |   6 +-
 .../Characteristics+InterfaceConsts.xml       |   6 +-
 .../ParcelablePeerHandle+InterfaceConsts.xml  |   6 +-
 .../PublishConfig+InterfaceConsts.xml         |   6 +-
 .../SubscribeConfig+InterfaceConsts.xml       |   6 +-
 .../WifiAwareNetworkInfo+InterfaceConsts.xml  |   6 +-
 ...iAwareNetworkSpecifier+InterfaceConsts.xml |   6 +-
 ...+CertificateCredential+InterfaceConsts.xml |   6 +-
 .../Credential+InterfaceConsts.xml            |   6 +-
 ...edential+SimCredential+InterfaceConsts.xml |   6 +-
 ...dential+UserCredential+InterfaceConsts.xml |   6 +-
 .../HomeSp+InterfaceConsts.xml                |   6 +-
 ...PasspointConfiguration+InterfaceConsts.xml |   6 +-
 .../WifiP2pServiceInfo+InterfaceConsts.xml    |   6 +-
 .../WifiP2pServiceRequest+InterfaceConsts.xml |   6 +-
 .../WifiP2pConfig+InterfaceConsts.xml         |   6 +-
 .../WifiP2pDevice+InterfaceConsts.xml         |   6 +-
 .../WifiP2pDeviceList+InterfaceConsts.xml     |   6 +-
 .../WifiP2pGroup+InterfaceConsts.xml          |   6 +-
 .../WifiP2pInfo+InterfaceConsts.xml           |   6 +-
 .../WifiP2pWfdInfo+InterfaceConsts.xml        |   6 +-
 .../RangingRequest+InterfaceConsts.xml        |   6 +-
 .../RangingResult+InterfaceConsts.xml         |   6 +-
 .../ResponderLocation+InterfaceConsts.xml     |   6 +-
 ...ult+InformationElement+InterfaceConsts.xml |   6 +-
 .../ScanResult+InterfaceConsts.xml            |   6 +-
 .../SoftApConfiguration+InterfaceConsts.xml   |   6 +-
 .../SupplicantState+InterfaceConsts.xml       |   6 +-
 .../WifiConfiguration+InterfaceConsts.xml     |   6 +-
 .../WifiEnterpriseConfig+InterfaceConsts.xml  |   6 +-
 .../WifiInfo+InterfaceConsts.xml              |   6 +-
 ...nager+AddNetworkResult+InterfaceConsts.xml |   6 +-
 .../WifiNetworkSpecifier+InterfaceConsts.xml  |   6 +-
 .../WifiNetworkSuggestion+InterfaceConsts.xml |   6 +-
 .../WpsInfo+InterfaceConsts.xml               |   6 +-
 .../CaptivePortal+InterfaceConsts.xml         |   6 +-
 ...ger+ConnectivityReport+InterfaceConsts.xml |   6 +-
 ...anager+DataStallReport+InterfaceConsts.xml |   6 +-
 .../Android.Net/DhcpInfo+InterfaceConsts.xml  |   6 +-
 .../Android.Net/IpPrefix+InterfaceConsts.xml  |   6 +-
 .../IpSecAlgorithm+InterfaceConsts.xml        |   6 +-
 .../LinkAddress+InterfaceConsts.xml           |   6 +-
 .../LinkProperties+InterfaceConsts.xml        |   6 +-
 .../MacAddress+InterfaceConsts.xml            |   6 +-
 .../Android.Net/Network+InterfaceConsts.xml   |   6 +-
 .../NetworkCapabilities+InterfaceConsts.xml   |   6 +-
 .../NetworkInfo+InterfaceConsts.xml           |   6 +-
 .../NetworkRequest+InterfaceConsts.xml        |   6 +-
 .../Android.Net/ProxyInfo+InterfaceConsts.xml |   6 +-
 .../Android.Net/RouteInfo+InterfaceConsts.xml |   6 +-
 ...ephonyNetworkSpecifier+InterfaceConsts.xml |   6 +-
 .../en/Android.Net/Uri+InterfaceConsts.xml    |   6 +-
 .../NdefMessage+InterfaceConsts.xml           |   6 +-
 .../NdefRecord+InterfaceConsts.xml            |   6 +-
 .../en/Android.Nfc/Tag+InterfaceConsts.xml    |   6 +-
 .../TimerStat+InterfaceConsts.xml             |   6 +-
 .../en/Android.OS.Storage/StorageManager.xml  |   4 +-
 .../StorageVolume+InterfaceConsts.xml         |   6 +-
 .../en/Android.OS/Bundle+InterfaceConsts.xml  |   6 +-
 .../CombinedVibration+InterfaceConsts.xml     |   6 +-
 .../CpuUsageInfo+InterfaceConsts.xml          |   6 +-
 .../Debug+MemoryInfo+InterfaceConsts.xml      |   6 +-
 .../DropBoxManager+Entry+InterfaceConsts.xml  |   6 +-
 .../Android.OS/LocaleList+InterfaceConsts.xml |   6 +-
 .../en/Android.OS/Message+InterfaceConsts.xml |   6 +-
 .../Android.OS/Messenger+InterfaceConsts.xml  |   6 +-
 .../ParcelFileDescriptor+InterfaceConsts.xml  |   6 +-
 .../Android.OS/ParcelUuid+InterfaceConsts.xml |   6 +-
 .../Mono.Android/en/Android.OS/Parcelable.xml |   6 +-
 .../PatternMatcher+InterfaceConsts.xml        |   6 +-
 .../PersistableBundle+InterfaceConsts.xml     |   6 +-
 .../ResultReceiver+InterfaceConsts.xml        |   6 +-
 .../SharedMemory+InterfaceConsts.xml          |   6 +-
 .../en/Android.OS/TokenWatcher.xml            |   2 +-
 .../Android.OS/UserHandle+InterfaceConsts.xml |   6 +-
 .../en/Android.OS/UserManager.xml             |   2 +-
 .../VibrationAttributes+InterfaceConsts.xml   |   6 +-
 .../VibrationEffect+InterfaceConsts.xml       |   6 +-
 .../Android.OS/WorkSource+InterfaceConsts.xml |   6 +-
 .../GLSurfaceView+IRenderer.xml               |   6 +-
 ...ferenceActivity+Header+InterfaceConsts.xml |   6 +-
 .../PageRange+InterfaceConsts.xml             |   6 +-
 .../PrintAttributes+InterfaceConsts.xml       |   6 +-
 ...ntDocumentAdapter+LayoutResultCallback.xml |   6 +-
 ...intDocumentAdapter+WriteResultCallback.xml |   6 +-
 .../en/Android.Print/PrintDocumentAdapter.xml |   4 +-
 .../PrintDocumentInfo+InterfaceConsts.xml     |   6 +-
 .../PrintJobId+InterfaceConsts.xml            |   6 +-
 .../en/Android.Print/PrintJobInfo+Builder.xml |   2 +-
 .../PrintJobInfo+InterfaceConsts.xml          |   6 +-
 .../en/Android.Print/PrintJobInfo.xml         |   2 +-
 .../en/Android.Print/PrintManager.xml         |   2 +-
 .../PrinterCapabilitiesInfo+Builder.xml       |   2 +-
 ...rinterCapabilitiesInfo+InterfaceConsts.xml |   6 +-
 .../PrinterId+InterfaceConsts.xml             |   6 +-
 .../PrinterInfo+InterfaceConsts.xml           |   6 +-
 ...ctsContract+SimAccount+InterfaceConsts.xml |   6 +-
 ...DocumentsContract+Path+InterfaceConsts.xml |   6 +-
 .../en/Android.SE.Omapi/Channel.xml           |  13 +-
 .../en/Android.SE.Omapi/Reader.xml            |   3 +-
 .../en/Android.SE.Omapi/SEService.xml         |   3 +-
 .../en/Android.SE.Omapi/Session.xml           |   3 +-
 ...riAuthenticationPolicy+InterfaceConsts.xml |   6 +-
 .../BatchUpdates+InterfaceConsts.xml          |   6 +-
 ...SequenceTransformation+InterfaceConsts.xml |   6 +-
 .../CustomDescription+InterfaceConsts.xml     |   6 +-
 .../Dataset+InterfaceConsts.xml               |   6 +-
 .../en/Android.Service.Autofill/Dataset.xml   |   2 +-
 .../DateTransformation+InterfaceConsts.xml    |   6 +-
 .../DateValueSanitizer+InterfaceConsts.xml    |   6 +-
 .../Android.Service.Autofill/FillCallback.xml |   3 +-
 .../FillContext+InterfaceConsts.xml           |   6 +-
 .../FillEventHistory+InterfaceConsts.xml      |   6 +-
 .../FillRequest+InterfaceConsts.xml           |   6 +-
 .../FillResponse+InterfaceConsts.xml          |   6 +-
 .../ImageTransformation+InterfaceConsts.xml   |   6 +-
 .../InlinePresentation+InterfaceConsts.xml    |   6 +-
 .../LuhnChecksumValidator+InterfaceConsts.xml |   6 +-
 .../RegexValidator+InterfaceConsts.xml        |   6 +-
 .../SaveInfo+InterfaceConsts.xml              |   6 +-
 .../SaveRequest+InterfaceConsts.xml           |   6 +-
 .../TextValueSanitizer+InterfaceConsts.xml    |   6 +-
 .../UserData+InterfaceConsts.xml              |   6 +-
 ...VisibilitySetterAction+InterfaceConsts.xml |   6 +-
 .../CarrierIdentifier+InterfaceConsts.xml     |   6 +-
 .../MessagePdu+InterfaceConsts.xml            |   6 +-
 .../ChooserTarget+InterfaceConsts.xml         |   6 +-
 .../ChooserTargetService.xml                  |   4 +-
 .../ControlButton+InterfaceConsts.xml         |   6 +-
 .../Control+InterfaceConsts.xml               |   6 +-
 .../Condition+InterfaceConsts.xml             |   6 +-
 ...enerService+RankingMap+InterfaceConsts.xml |   6 +-
 .../StatusBarNotification+InterfaceConsts.xml |   6 +-
 .../ZenPolicy+InterfaceConsts.xml             |   6 +-
 .../GetWalletCardsError+InterfaceConsts.xml   |   6 +-
 .../GetWalletCardsRequest+InterfaceConsts.xml |   6 +-
 ...GetWalletCardsResponse+InterfaceConsts.xml |   6 +-
 ...electWalletCardRequest+InterfaceConsts.xml |   6 +-
 .../WalletCard+InterfaceConsts.xml            |   6 +-
 .../WalletServiceEvent+InterfaceConsts.xml    |   6 +-
 .../Tile+InterfaceConsts.xml                  |   6 +-
 .../en/Android.Speech.Tts/TextToSpeech.xml    |  43 +-
 .../Voice+InterfaceConsts.xml                 |   6 +-
 .../en/Android.Telecom/Call+RttCall.xml       |  11 +-
 .../CallAudioState+InterfaceConsts.xml        |   6 +-
 .../Connection+RttTextStream.xml              |   8 +-
 .../ConnectionRequest+InterfaceConsts.xml     |   6 +-
 .../DisconnectCause+InterfaceConsts.xml       |   6 +-
 .../GatewayInfo+InterfaceConsts.xml           |   6 +-
 .../PhoneAccount+InterfaceConsts.xml          |   6 +-
 .../PhoneAccountHandle+InterfaceConsts.xml    |   6 +-
 ...PhoneAccountSuggestion+InterfaceConsts.xml |   6 +-
 .../StatusHints+InterfaceConsts.xml           |   6 +-
 ...ile+CameraCapabilities+InterfaceConsts.xml |   6 +-
 .../VideoProfile+InterfaceConsts.xml          |   6 +-
 .../ApnSetting+InterfaceConsts.xml            |   6 +-
 .../NetworkSliceInfo+InterfaceConsts.xml      |   6 +-
 .../NetworkSlicingConfig+InterfaceConsts.xml  |   6 +-
 ...uteSelectionDescriptor+InterfaceConsts.xml |   6 +-
 .../TrafficDescriptor+InterfaceConsts.xml     |   6 +-
 .../UrspRule+InterfaceConsts.xml              |   6 +-
 .../EmergencyNumber+InterfaceConsts.xml       |   6 +-
 ...wnloadableSubscription+InterfaceConsts.xml |   6 +-
 .../EuiccInfo+InterfaceConsts.xml             |   6 +-
 .../en/Android.Telephony.Gsm/SmsManager.xml   |   2 +-
 .../en/Android.Telephony.Gsm/SmsMessage.xml   |   2 +-
 .../ImsReasonInfo+InterfaceConsts.xml         |   6 +-
 ...RegistrationAttributes+InterfaceConsts.xml |   6 +-
 .../DownloadRequest+InterfaceConsts.xml       |   6 +-
 .../FileInfo+InterfaceConsts.xml              |   6 +-
 .../FileServiceInfo+InterfaceConsts.xml       |   6 +-
 .../StreamingServiceInfo+InterfaceConsts.xml  |   6 +-
 .../AvailableNetworkInfo+InterfaceConsts.xml  |   6 +-
 ...nfo+BarringServiceInfo+InterfaceConsts.xml |   6 +-
 .../BarringInfo+InterfaceConsts.xml           |   6 +-
 .../CellIdentity+InterfaceConsts.xml          |   6 +-
 .../CellInfo+InterfaceConsts.xml              |   6 +-
 ...CellSignalStrengthCdma+InterfaceConsts.xml |   6 +-
 .../CellSignalStrengthGsm+InterfaceConsts.xml |   6 +-
 .../CellSignalStrengthLte+InterfaceConsts.xml |   6 +-
 .../CellSignalStrengthNr+InterfaceConsts.xml  |   6 +-
 ...lSignalStrengthTdscdma+InterfaceConsts.xml |   6 +-
 ...ellSignalStrengthWcdma+InterfaceConsts.xml |   6 +-
 ...sedSubscriberGroupInfo+InterfaceConsts.xml |   6 +-
 ...LogicalChannelResponse+InterfaceConsts.xml |   6 +-
 .../NeighboringCellInfo+InterfaceConsts.xml   |   6 +-
 ...etworkRegistrationInfo+InterfaceConsts.xml |   6 +-
 .../NetworkScanRequest+InterfaceConsts.xml    |   6 +-
 .../PhoneNumberFormattingTextWatcher.xml      |   2 +-
 .../en/Android.Telephony/PhoneNumberUtils.xml |   7 +-
 .../PhysicalChannelConfig+InterfaceConsts.xml |   6 +-
 ...iseDataConnectionState+InterfaceConsts.xml |   6 +-
 .../RadioAccessSpecifier+InterfaceConsts.xml  |   6 +-
 .../ServiceState+InterfaceConsts.xml          |   6 +-
 .../SignalStrength+InterfaceConsts.xml        |   6 +-
 ...lStrengthUpdateRequest+InterfaceConsts.xml |   6 +-
 .../SignalThresholdInfo+InterfaceConsts.xml   |   6 +-
 .../en/Android.Telephony/SmsManager.xml       | 378 ++++-----
 .../en/Android.Telephony/SmsMessage.xml       |   2 +-
 .../SubscriptionInfo+InterfaceConsts.xml      |   6 +-
 .../SubscriptionPlan+InterfaceConsts.xml      |   6 +-
 .../TelephonyDisplayInfo+InterfaceConsts.xml  |   6 +-
 .../UiccCardInfo+InterfaceConsts.xml          |   6 +-
 .../VisualVoicemailSms+InterfaceConsts.xml    |   6 +-
 ...emailSmsFilterSettings+InterfaceConsts.xml |   6 +-
 .../en/Android.Test/ViewAsserts.xml           |   8 +-
 .../CharacterPickerDialog.xml                 |   4 +-
 .../Android.Text.Method/QwertyKeyListener.xml |   4 +-
 .../AbsoluteSizeSpan+InterfaceConsts.xml      |   6 +-
 .../Android.Text.Style/AbsoluteSizeSpan.xml   |  11 +-
 .../AlignmentSpanStandard+InterfaceConsts.xml |   6 +-
 .../BackgroundColorSpan+InterfaceConsts.xml   |   6 +-
 .../BulletSpan+InterfaceConsts.xml            |   6 +-
 .../EasyEditSpan+InterfaceConsts.xml          |   6 +-
 .../ForegroundColorSpan+InterfaceConsts.xml   |   6 +-
 .../en/Android.Text.Style/ImageSpan.xml       |  12 +-
 ...dingMarginSpanStandard+InterfaceConsts.xml |   6 +-
 ...BackgroundSpanStandard+InterfaceConsts.xml |   6 +-
 ...LineHeightSpanStandard+InterfaceConsts.xml |   6 +-
 .../LineHeightSpanStandard.xml                |   2 +-
 .../LocaleSpan+InterfaceConsts.xml            |   6 +-
 .../en/Android.Text.Style/MaskFilterSpan.xml  |   2 +-
 .../QuoteSpan+InterfaceConsts.xml             |   6 +-
 .../RelativeSizeSpan+InterfaceConsts.xml      |   6 +-
 .../ScaleXSpan+InterfaceConsts.xml            |   6 +-
 .../StrikethroughSpan+InterfaceConsts.xml     |   6 +-
 .../StyleSpan+InterfaceConsts.xml             |   6 +-
 .../SubscriptSpan+InterfaceConsts.xml         |   6 +-
 .../SuggestionSpan+InterfaceConsts.xml        |   6 +-
 .../SuperscriptSpan+InterfaceConsts.xml       |   6 +-
 .../TextAppearanceSpan+InterfaceConsts.xml    |   6 +-
 .../Android.Text.Style/TextAppearanceSpan.xml |  33 +-
 .../TtsSpan+InterfaceConsts.xml               |   6 +-
 .../TypefaceSpan+InterfaceConsts.xml          |   6 +-
 .../URLSpan+InterfaceConsts.xml               |   6 +-
 .../UnderlineSpan+InterfaceConsts.xml         |   6 +-
 .../en/Android.Text.Util/Linkify.xml          |   4 +-
 .../en/Android.Text/AlteredCharSequence.xml   |  12 +-
 .../en/Android.Text/AndroidCharacter.xml      |  12 +-
 .../Annotation+InterfaceConsts.xml            |   6 +-
 .../en/Android.Text/IEditable.xml             |   6 +-
 .../en/Android.Text/IInputFilter.xml          |   6 +-
 .../en/Android.Text/ISpanWatcher.xml          |   4 +-
 .../en/Android.Text/ISpannable.xml            |   2 +-
 .../Mono.Android/en/Android.Text/ISpanned.xml |   8 +-
 .../en/Android.Text/ITextWatcher.xml          |  14 +-
 .../en/Android.Text/LoginFilter.xml           |  12 +-
 .../en/Android.Text/Selection.xml             |   8 +-
 .../Android.Text/SpannableStringBuilder.xml   |   4 +-
 .../en/Android.Text/TextUtils.xml             |   4 +-
 .../en/Android.Transitions/ChangeBounds.xml   |   2 +-
 .../Android.Transitions/ChangeTransform.xml   |  10 +-
 .../en/Android.Transitions/PathMotion.xml     |   8 +-
 .../en/Android.Transitions/Scene.xml          |   2 +-
 .../Android.Transitions/SidePropagation.xml   |   2 +-
 .../Transition+EpicenterCallback.xml          |   2 +-
 .../en/Android.Transitions/Transition.xml     |  30 +-
 .../TransitionPropagation.xml                 |  12 +-
 .../en/Android.Transitions/Visibility.xml     |   4 +-
 .../VisibilityPropagation.xml                 |   2 +-
 .../en/Android.Util/FloatProperty.xml         |   4 +-
 .../en/Android.Util/IntProperty.xml           |   4 +-
 .../en/Android.Util/LongSparseArray.xml       |  14 +-
 .../Mono.Android/en/Android.Util/Property.xml |  20 +-
 .../en/Android.Util/SizeF+InterfaceConsts.xml |   6 +-
 .../en/Android.Util/SparseArray.xml           |  19 +-
 .../en/Android.Util/SparseBooleanArray.xml    |  10 +-
 .../en/Android.Util/SparseIntArray.xml        |  10 +-
 .../en/Android.Util/SparseLongArray.xml       |  10 +-
 .../AccessibilityEvent+InterfaceConsts.xml    |   6 +-
 .../AccessibilityEvent.xml                    |   2 +-
 ...fo+AccessibilityAction+InterfaceConsts.xml |   6 +-
 .../AccessibilityNodeInfo+InterfaceConsts.xml |   6 +-
 ...Info+TouchDelegateInfo+InterfaceConsts.xml |   6 +-
 .../AccessibilityNodeInfo.xml                 |  16 +-
 .../AccessibilityNodeProvider.xml             |   8 +-
 .../AccessibilityRecord.xml                   |   2 +-
 ...ccessibilityWindowInfo+InterfaceConsts.xml |   6 +-
 .../en/Android.Views.Animations/Animation.xml |   2 +-
 .../PathInterpolator.xml                      |  11 +-
 .../AutofillId+InterfaceConsts.xml            |   6 +-
 .../AutofillValue+InterfaceConsts.xml         |   6 +-
 ...ontentCaptureCondition+InterfaceConsts.xml |   6 +-
 .../ContentCaptureContext+InterfaceConsts.xml |   6 +-
 ...ontentCaptureSessionId+InterfaceConsts.xml |   6 +-
 .../DataRemovalRequest+InterfaceConsts.xml    |   6 +-
 .../DataShareRequest+InterfaceConsts.xml      |   6 +-
 .../DisplayHash+InterfaceConsts.xml           |   6 +-
 .../VerifiedDisplayHash+InterfaceConsts.xml   |   6 +-
 .../CompletionInfo+InterfaceConsts.xml        |   6 +-
 .../CorrectionInfo+InterfaceConsts.xml        |   6 +-
 .../CursorAnchorInfo+InterfaceConsts.xml      |   6 +-
 .../EditorInfo+InterfaceConsts.xml            |   6 +-
 .../ExtractedText+InterfaceConsts.xml         |   6 +-
 .../ExtractedTextRequest+InterfaceConsts.xml  |   6 +-
 .../InlineSuggestion+InterfaceConsts.xml      |   6 +-
 .../InlineSuggestionInfo+InterfaceConsts.xml  |   6 +-
 ...lineSuggestionsRequest+InterfaceConsts.xml |   6 +-
 ...ineSuggestionsResponse+InterfaceConsts.xml |   6 +-
 .../InputBinding+InterfaceConsts.xml          |   6 +-
 .../InputContentInfo+InterfaceConsts.xml      |   6 +-
 .../InputMethodInfo+InterfaceConsts.xml       |   6 +-
 .../InputMethodSubtype+InterfaceConsts.xml    |   6 +-
 .../SurroundingText+InterfaceConsts.xml       |   6 +-
 .../ConversationAction+InterfaceConsts.xml    |   6 +-
 .../ConversationActions+InterfaceConsts.xml   |   6 +-
 ...rsationActions+Message+InterfaceConsts.xml |   6 +-
 ...rsationActions+Request+InterfaceConsts.xml |   6 +-
 .../SelectionEvent+InterfaceConsts.xml        |   6 +-
 .../TextClassification+InterfaceConsts.xml    |   6 +-
 ...Classification+Request+InterfaceConsts.xml |   6 +-
 ...tClassificationContext+InterfaceConsts.xml |   6 +-
 ...lassificationSessionId+InterfaceConsts.xml |   6 +-
 ...ClassifierEntityConfig+InterfaceConsts.xml |   6 +-
 .../TextClassifierEvent+InterfaceConsts.xml   |   6 +-
 .../TextLanguage+InterfaceConsts.xml          |   6 +-
 .../TextLanguage+Request+InterfaceConsts.xml  |   6 +-
 .../TextLinks+InterfaceConsts.xml             |   6 +-
 .../TextLinks+Request+InterfaceConsts.xml     |   6 +-
 .../TextLinks+TextLink+InterfaceConsts.xml    |   6 +-
 .../TextSelection+InterfaceConsts.xml         |   6 +-
 .../TextSelection+Request+InterfaceConsts.xml |   6 +-
 ...entenceSuggestionsInfo+InterfaceConsts.xml |   6 +-
 .../SpellCheckerInfo+InterfaceConsts.xml      |   6 +-
 .../SpellCheckerSubtype+InterfaceConsts.xml   |   6 +-
 .../SuggestionsInfo+InterfaceConsts.xml       |   6 +-
 .../TextInfo+InterfaceConsts.xml              |   6 +-
 .../TranslationCapability+InterfaceConsts.xml |   6 +-
 .../TranslationContext+InterfaceConsts.xml    |   6 +-
 .../TranslationRequest+InterfaceConsts.xml    |   6 +-
 ...ranslationRequestValue+InterfaceConsts.xml |   6 +-
 .../TranslationResponse+InterfaceConsts.xml   |   6 +-
 ...anslationResponseValue+InterfaceConsts.xml |   6 +-
 .../TranslationSpec+InterfaceConsts.xml       |   6 +-
 ...ViewTranslationRequest+InterfaceConsts.xml |   6 +-
 ...iewTranslationResponse+InterfaceConsts.xml |   6 +-
 .../AbsSavedState+InterfaceConsts.xml         |   6 +-
 .../ContentInfo+InterfaceConsts.xml           |   6 +-
 ...isplay+HdrCapabilities+InterfaceConsts.xml |   6 +-
 .../Display+Mode+InterfaceConsts.xml          |   6 +-
 ...DragAndDropPermissions+InterfaceConsts.xml |   6 +-
 .../DragEvent+InterfaceConsts.xml             |   6 +-
 .../en/Android.Views/IViewParent.xml          |   4 +-
 .../InputDevice+InterfaceConsts.xml           |   6 +-
 .../InputEvent+InterfaceConsts.xml            |   6 +-
 .../KeyCharacterMap+InterfaceConsts.xml       |   6 +-
 .../KeyboardShortcutGroup+InterfaceConsts.xml |   6 +-
 .../KeyboardShortcutInfo+InterfaceConsts.xml  |   6 +-
 .../en/Android.Views/LayoutInflater.xml       |   4 +-
 .../en/Android.Views/MenuInflater.xml         |   2 +-
 ...PixelCopy+IOnPixelCopyFinishedListener.xml |   2 +-
 .../PointerIcon+InterfaceConsts.xml           |   6 +-
 .../RoundedCorner+InterfaceConsts.xml         |   6 +-
 .../Android.Views/Surface+InterfaceConsts.xml |   6 +-
 .../Mono.Android/en/Android.Views/Surface.xml |   8 +-
 .../SurfaceControl+InterfaceConsts.xml        |   6 +-
 ...aceControl+Transaction+InterfaceConsts.xml |   6 +-
 ...iewHost+SurfacePackage+InterfaceConsts.xml |   6 +-
 .../Android.Views/SurfaceControlViewHost.xml  |   3 -
 .../VerifiedInputEvent+InterfaceConsts.xml    |   6 +-
 docs/Mono.Android/en/Android.Views/View.xml   |  16 +-
 .../en/Android.Views/ViewAnimationUtils.xml   |   4 +-
 .../Android.Views/ViewDebug+FlagToString.xml  |   2 +-
 .../en/Android.Views/ViewGroup.xml            |  13 +-
 .../en/Android.Views/ViewOutlineProvider.xml  |   4 +-
 .../en/Android.Views/ViewPropertyAnimator.xml |  50 +-
 .../en/Android.Views/ViewStructure.xml        |   3 +-
 docs/Mono.Android/en/Android.Views/Window.xml |  28 +-
 ...dowAnimationFrameStats+InterfaceConsts.xml |   6 +-
 ...indowContentFrameStats+InterfaceConsts.xml |   6 +-
 .../WindowId+InterfaceConsts.xml              |   6 +-
 ...dowManagerLayoutParams+InterfaceConsts.xml |   6 +-
 .../en/Android.Webkit/WebSettings.xml         |   4 +
 ...InlinePresentationSpec+InterfaceConsts.xml |   6 +-
 .../AbsListView+IMultiChoiceModeListener.xml  |   3 +-
 .../en/Android.Widget/AbsListView.xml         |   8 +-
 ...ctionMenuView+IOnMenuItemClickListener.xml |   3 +-
 .../Android.Widget/AutoCompleteTextView.xml   |   8 +-
 .../en/Android.Widget/EdgeEffect.xml          |   4 +-
 .../Android.Widget/ListView+FixedViewInfo.xml |   3 +-
 .../MultiAutoCompleteTextView+ITokenizer.xml  |   6 +-
 .../RemoteViews+InterfaceConsts.xml           |   6 +-
 ...+RemoteCollectionItems+InterfaceConsts.xml |   6 +-
 .../en/Android.Widget/TextClock.xml           |   3 +-
 .../en/Android.Widget/TextView.xml            |   4 +-
 .../Toolbar+IOnMenuItemClickListener.xml      |   3 +-
 .../en/Android.Widget/Toolbar.xml             |   4 +-
 .../en/Android.Widget/VideoView.xml           |   2 +-
 .../en/Java.Awt.Font/NumericShaper.xml        |  23 +-
 .../en/Java.Awt.Font/TextAttribute.xml        |  18 +-
 .../Java.Beans/IndexedPropertyChangeEvent.xml |   2 +-
 .../en/Java.Beans/PropertyChangeSupport.xml   |   8 +-
 .../en/Java.IO/BufferedInputStream.xml        |  20 +-
 .../en/Java.IO/ByteArrayInputStream.xml       |  12 +-
 .../en/Java.IO/ByteArrayOutputStream.xml      |   6 +-
 .../en/Java.IO/DataInputStream.xml            |  86 +-
 .../en/Java.IO/DataOutputStream.xml           |  46 +-
 docs/Mono.Android/en/Java.IO/EOFException.xml |   4 +-
 docs/Mono.Android/en/Java.IO/File.xml         | 161 ++--
 .../en/Java.IO/FileDescriptor.xml             |   5 +-
 .../en/Java.IO/FileInputStream.xml            |  22 +-
 .../en/Java.IO/FileNotFoundException.xml      |   6 +-
 .../en/Java.IO/FileOutputStream.xml           |  14 +-
 docs/Mono.Android/en/Java.IO/FileWriter.xml   |   4 +-
 .../en/Java.IO/FilterInputStream.xml          |  13 +-
 .../en/Java.IO/FilterOutputStream.xml         |   6 +-
 docs/Mono.Android/en/Java.IO/IDataOutput.xml  |  38 +-
 docs/Mono.Android/en/Java.IO/IFileFilter.xml  |   3 +-
 .../en/Java.IO/IFilenameFilter.xml            |   5 +-
 docs/Mono.Android/en/Java.IO/InputStream.xml  |  25 +-
 .../en/Java.IO/InputStreamReader.xml          |   2 +-
 .../en/Java.IO/InterruptedIOException.xml     |   6 +-
 .../en/Java.IO/InvalidObjectException.xml     |   2 +-
 .../en/Java.IO/ObjectInputStream+GetField.xml |  36 +-
 .../en/Java.IO/ObjectInputStream.xml          |   6 +-
 .../Java.IO/ObjectOutputStream+PutField.xml   |   4 +-
 .../en/Java.IO/ObjectStreamClass.xml          |   2 +-
 .../en/Java.IO/ObjectStreamField.xml          |   8 +-
 docs/Mono.Android/en/Java.IO/OutputStream.xml |   9 +-
 .../en/Java.IO/OutputStreamWriter.xml         |   2 +-
 .../en/Java.IO/PipedInputStream.xml           |  16 +-
 .../en/Java.IO/PipedOutputStream.xml          |   4 +-
 docs/Mono.Android/en/Java.IO/PipedReader.xml  |  18 +-
 docs/Mono.Android/en/Java.IO/PipedWriter.xml  |   4 +-
 docs/Mono.Android/en/Java.IO/PrintStream.xml  |  53 +-
 docs/Mono.Android/en/Java.IO/PrintWriter.xml  |  39 +-
 .../en/Java.IO/PushbackInputStream.xml        |  14 +-
 .../en/Java.IO/SequenceInputStream.xml        |  18 +-
 .../en/Java.IO/StreamTokenizer.xml            |   6 +-
 .../en/Java.IO/StringBufferInputStream.xml    |   2 +-
 .../en/Java.IO/UTFDataFormatException.xml     |   6 +-
 .../en/Java.Lang.Ref/Reference.xml            |   7 +-
 .../en/Java.Lang.Ref/ReferenceQueue.xml       |   6 +-
 .../en/Java.Lang/AbstractMethodError.xml      |   4 +-
 .../ArrayIndexOutOfBoundsException.xml        |   6 +-
 .../en/Java.Lang/ArrayStoreException.xml      |   4 +-
 .../en/Java.Lang/AssertionError.xml           |  12 +-
 docs/Mono.Android/en/Java.Lang/Character.xml  |  10 +-
 .../en/Java.Lang/ClassCastException.xml       |   4 +-
 .../en/Java.Lang/ClassFormatError.xml         |   4 +-
 .../en/Java.Lang/ClassNotFoundException.xml   |  10 +-
 .../Java.Lang/CloneNotSupportedException.xml  |  10 +-
 .../Java.Lang/ExceptionInInitializerError.xml |  12 +-
 .../en/Java.Lang/ICharSequence.xml            |  12 +-
 docs/Mono.Android/en/Java.Lang/ICloneable.xml |   2 +-
 docs/Mono.Android/en/Java.Lang/IRunnable.xml  |   6 +-
 .../en/Java.Lang/IllegalAccessError.xml       |   4 +-
 .../en/Java.Lang/IllegalAccessException.xml   |   4 +-
 .../en/Java.Lang/IllegalArgumentException.xml |   4 +-
 .../IllegalMonitorStateException.xml          |   4 +-
 .../Java.Lang/IllegalThreadStateException.xml |   4 +-
 .../IncompatibleClassChangeError.xml          |   4 +-
 .../Java.Lang/IndexOutOfBoundsException.xml   |   4 +-
 .../en/Java.Lang/InstantiationError.xml       |   6 +-
 .../en/Java.Lang/InternalError.xml            |   4 +-
 .../en/Java.Lang/InterruptedException.xml     |   4 +-
 docs/Mono.Android/en/Java.Lang/JavaSystem.xml |  12 +-
 .../Java.Lang/NegativeArraySizeException.xml  |   4 +-
 .../en/Java.Lang/NoClassDefFoundError.xml     |   8 +-
 .../en/Java.Lang/NoSuchFieldError.xml         |   4 +-
 .../en/Java.Lang/NoSuchMethodError.xml        |   4 +-
 .../en/Java.Lang/NoSuchMethodException.xml    |   4 +-
 .../en/Java.Lang/NumberFormatException.xml    |   4 +-
 docs/Mono.Android/en/Java.Lang/Runtime.xml    |  16 +-
 .../en/Java.Lang/SecurityException.xml        |   8 +-
 .../en/Java.Lang/StackOverflowError.xml       |   4 +-
 docs/Mono.Android/en/Java.Lang/Thread.xml     |  28 +-
 .../Mono.Android/en/Java.Lang/ThreadGroup.xml |  14 +-
 .../en/Java.Lang/UnknownError.xml             |   4 +-
 .../en/Java.Lang/UnsatisfiedLinkError.xml     |   6 +-
 .../UnsupportedClassVersionError.xml          |   4 +-
 .../Mono.Android/en/Java.Lang/VerifyError.xml |   4 +-
 .../en/Java.Lang/VirtualMachineError.xml      |   4 +-
 docs/Mono.Android/en/Java.Net/URL.xml         |   6 +-
 .../en/Java.Sql/BatchUpdateException.xml      | 131 ++--
 .../en/Java.Sql/ClientInfoStatus.xml          |   2 +-
 .../en/Java.Sql/DataTruncation.xml            |  32 +-
 .../en/Java.Sql/DatabaseMetaData.xml          |  71 +-
 docs/Mono.Android/en/Java.Sql/Date.xml        |  16 +-
 .../en/Java.Sql/DriverManager.xml             |  34 +-
 .../en/Java.Sql/DriverPropertyInfo.xml        |  13 +-
 docs/Mono.Android/en/Java.Sql/IArray.xml      |  68 +-
 docs/Mono.Android/en/Java.Sql/IBlob.xml       |  89 +--
 .../en/Java.Sql/ICallableStatement.xml        | 625 +++++++--------
 docs/Mono.Android/en/Java.Sql/IClob.xml       |  81 +-
 docs/Mono.Android/en/Java.Sql/IConnection.xml | 220 +++---
 .../en/Java.Sql/IDatabaseMetaData.xml         | 700 ++++++++++-------
 docs/Mono.Android/en/Java.Sql/IDriver.xml     |  12 +-
 docs/Mono.Android/en/Java.Sql/INClob.xml      |   2 +-
 .../en/Java.Sql/IParameterMetaData.xml        |  28 +-
 .../en/Java.Sql/IPreparedStatement.xml        | 138 ++--
 docs/Mono.Android/en/Java.Sql/IRef.xml        |  10 +-
 docs/Mono.Android/en/Java.Sql/IResultSet.xml  | 732 +++++++++---------
 .../en/Java.Sql/IResultSetMetaData.xml        |  40 +-
 docs/Mono.Android/en/Java.Sql/IRowId.xml      |  20 +-
 docs/Mono.Android/en/Java.Sql/ISQLData.xml    |   4 +-
 docs/Mono.Android/en/Java.Sql/ISQLInput.xml   | 150 ++--
 docs/Mono.Android/en/Java.Sql/ISQLOutput.xml  |  54 +-
 docs/Mono.Android/en/Java.Sql/ISavepoint.xml  |   2 +-
 docs/Mono.Android/en/Java.Sql/IStatement.xml  | 127 +--
 docs/Mono.Android/en/Java.Sql/IStruct.xml     |   4 +-
 .../en/Java.Sql/ParameterMetaData.xml         |   4 +-
 docs/Mono.Android/en/Java.Sql/ResultSet.xml   |  18 +-
 .../en/Java.Sql/ResultSetMetaData.xml         |   4 +-
 .../en/Java.Sql/SQLClientInfoException.xml    |  76 +-
 .../en/Java.Sql/SQLDataException.xml          |  42 +-
 .../Mono.Android/en/Java.Sql/SQLException.xml |  62 +-
 .../SQLFeatureNotSupportedException.xml       |  42 +-
 ...LIntegrityConstraintViolationException.xml |  42 +-
 .../SQLInvalidAuthorizationSpecException.xml  |  42 +-
 .../SQLNonTransientConnectionException.xml    |  42 +-
 .../en/Java.Sql/SQLNonTransientException.xml  |  44 +-
 .../en/Java.Sql/SQLRecoverableException.xml   |  42 +-
 .../en/Java.Sql/SQLSyntaxErrorException.xml   |  42 +-
 .../en/Java.Sql/SQLTimeoutException.xml       |  44 +-
 .../SQLTransactionRollbackException.xml       |  42 +-
 .../SQLTransientConnectionException.xml       |  42 +-
 .../en/Java.Sql/SQLTransientException.xml     |  42 +-
 docs/Mono.Android/en/Java.Sql/SQLWarning.xml  |  52 +-
 docs/Mono.Android/en/Java.Sql/Statement.xml   |  12 +-
 docs/Mono.Android/en/Java.Sql/Time.xml        |  11 +-
 docs/Mono.Android/en/Java.Sql/Timestamp.xml   |  76 +-
 docs/Mono.Android/en/Java.Sql/Types.xml       |  72 +-
 docs/Mono.Android/en/Java.Text/Bidi.xml       |   6 +-
 .../en/Java.Text/BreakIterator.xml            |  37 +-
 .../en/Java.Text/ChoiceFormat.xml             |   2 +-
 .../en/Java.Text/CollationElementIterator.xml |   2 +-
 .../en/Java.Text/CollationKey.xml             |   4 +-
 docs/Mono.Android/en/Java.Text/Collator.xml   |   8 +-
 .../en/Java.Text/DateFormat+Field.xml         |  21 +-
 docs/Mono.Android/en/Java.Text/DateFormat.xml |  16 +-
 .../en/Java.Text/DateFormatSymbols.xml        |  31 +-
 .../en/Java.Text/DecimalFormat.xml            |  19 +-
 .../en/Java.Text/DecimalFormatSymbols.xml     |  14 +-
 .../en/Java.Text/FieldPosition.xml            |   3 +-
 .../en/Java.Text/MessageFormat+Field.xml      |   4 +-
 .../en/Java.Text/MessageFormat.xml            |  25 +-
 docs/Mono.Android/en/Java.Text/Normalizer.xml |   2 +-
 .../en/Java.Text/NumberFormat+Field.xml       |   5 +-
 .../en/Java.Text/NumberFormat.xml             |  29 +-
 .../en/Java.Text/ParsePosition.xml            |   3 +-
 .../en/Java.Text/RuleBasedCollator.xml        |   4 +-
 .../en/Java.Text/SimpleDateFormat.xml         |  25 +-
 .../en/Java.Text/StringCharacterIterator.xml  |   5 +-
 .../en/Java.Text/_Format+Field.xml            |   5 +-
 docs/Mono.Android/en/Java.Text/_Format.xml    |  19 +-
 .../en/Java.Util.Jar/JarEntry.xml             |  40 +-
 .../Mono.Android/en/Java.Util.Jar/JarFile.xml |  36 +-
 .../en/Java.Util.Jar/JarInputStream.xml       |  14 +-
 .../en/Java.Util.Jar/JarOutputStream.xml      |  10 +-
 .../en/Java.Util.Logging/Level.xml            |   2 +-
 .../en/Java.Util.Prefs/NodeChangeEvent.xml    |   2 +-
 .../Java.Util.Prefs/PreferenceChangeEvent.xml |   2 +-
 .../en/Java.Util.Regex/Matcher.xml            |   6 +-
 .../en/Java.Util.Regex/Pattern.xml            |   4 +-
 .../en/Java.Util.Zip/ZipException.xml         |   4 +-
 .../Mono.Android/en/Java.Util.Zip/ZipFile.xml |   8 +-
 .../en/Java.Util.Zip/ZipInputStream.xml       |   2 +-
 .../en/Java.Util/AbstractSequentialList.xml   |   2 +-
 docs/Mono.Android/en/Java.Util/Calendar.xml   | 183 ++---
 docs/Mono.Android/en/Java.Util/Currency.xml   |  10 +-
 docs/Mono.Android/en/Java.Util/Date.xml       |  54 +-
 docs/Mono.Android/en/Java.Util/Dictionary.xml |  22 +-
 .../en/Java.Util/EmptyStackException.xml      |   4 +-
 .../en/Java.Util/GregorianCalendar.xml        |  66 +-
 docs/Mono.Android/en/Java.Util/Hashtable.xml  |  25 +-
 .../Mono.Android/en/Java.Util/IComparator.xml |   3 +-
 docs/Mono.Android/en/Java.Util/IObserver.xml  |   4 +-
 .../en/Java.Util/IllformedLocaleException.xml |   6 +-
 .../en/Java.Util/InputMismatchException.xml   |   6 +-
 .../en/Java.Util/ListResourceBundle.xml       |  17 +-
 .../en/Java.Util/Locale+Builder.xml           |   5 +-
 docs/Mono.Android/en/Java.Util/Locale.xml     |  20 +-
 .../en/Java.Util/NoSuchElementException.xml   |   4 +-
 docs/Mono.Android/en/Java.Util/Observable.xml |  15 +-
 .../en/Java.Util/PropertyResourceBundle.xml   |  13 +-
 .../en/Java.Util/ResourceBundle+Control.xml   |  78 +-
 .../en/Java.Util/ResourceBundle.xml           |  29 +-
 docs/Mono.Android/en/Java.Util/Scanner.xml    |  42 +-
 .../en/Java.Util/SimpleTimeZone.xml           |  23 +-
 docs/Mono.Android/en/Java.Util/Stack.xml      |  11 +-
 .../en/Java.Util/StringTokenizer.xml          |  20 +-
 docs/Mono.Android/en/Java.Util/TimeZone.xml   |  23 +-
 .../Java.Util/TooManyListenersException.xml   |   2 +-
 docs/Mono.Android/en/Java.Util/Vector.xml     |   2 +-
 .../Javax.Crypto.Interfaces/IDHPrivateKey.xml |   4 +-
 .../Javax.Crypto.Interfaces/IDHPublicKey.xml  |   4 +-
 .../en/Javax.Crypto.Spec/DESKeySpec.xml       |  14 +-
 .../en/Javax.Crypto.Spec/DESedeKeySpec.xml    |  10 +-
 .../en/Javax.Crypto.Spec/DHParameterSpec.xml  |  18 +-
 .../en/Javax.Crypto.Spec/DHPrivateKeySpec.xml |  16 +-
 .../en/Javax.Crypto.Spec/DHPublicKeySpec.xml  |  16 +-
 .../en/Javax.Crypto.Spec/IvParameterSpec.xml  |  12 +-
 .../Javax.Crypto.Spec/OAEPParameterSpec.xml   |   8 +-
 .../en/Javax.Crypto.Spec/PBEParameterSpec.xml |   4 +-
 .../Javax.Crypto.Spec/PSource+PSpecified.xml  |   2 +-
 .../en/Javax.Crypto.Spec/RC2ParameterSpec.xml |   4 +-
 .../en/Javax.Crypto.Spec/RC5ParameterSpec.xml |  10 +-
 .../en/Javax.Crypto.Spec/SecretKeySpec.xml    |  10 +-
 docs/Mono.Android/en/Javax.Crypto/Cipher.xml  |  92 +--
 .../en/Javax.Crypto/CipherSpi.xml             |  44 +-
 .../Javax.Crypto/EncryptedPrivateKeyInfo.xml  |  18 +-
 .../en/Javax.Crypto/ExemptionMechanism.xml    |  34 +-
 .../en/Javax.Crypto/ExemptionMechanismSpi.xml |  10 +-
 .../en/Javax.Crypto/KeyAgreement.xml          |  28 +-
 .../en/Javax.Crypto/KeyAgreementSpi.xml       |   8 +-
 .../en/Javax.Crypto/KeyGenerator.xml          |  20 +-
 .../en/Javax.Crypto/KeyGeneratorSpi.xml       |   2 +-
 docs/Mono.Android/en/Javax.Crypto/Mac.xml     |  37 +-
 docs/Mono.Android/en/Javax.Crypto/MacSpi.xml  |  11 +-
 .../en/Javax.Crypto/SecretKeyFactory.xml      |  22 +-
 .../en/Javax.Crypto/SecretKeyFactorySpi.xml   |   4 +-
 .../en/Javax.Net.Ssl/ExtendedSSLSession.xml   |   6 +-
 .../Javax.Net.Ssl/HandshakeCompletedEvent.xml |   2 +-
 .../en/Javax.Net.Ssl/HttpsURLConnection.xml   |  21 +-
 .../en/Javax.Net.Ssl/ISSLSession.xml          |   4 +-
 .../en/Javax.Net.Ssl/ISSLSessionContext.xml   |   8 +-
 .../en/Javax.Net.Ssl/KeyManagerFactory.xml    |  20 +-
 .../en/Javax.Net.Ssl/KeyManagerFactorySpi.xml |   2 +-
 .../en/Javax.Net.Ssl/SSLContext.xml           |  38 +-
 .../en/Javax.Net.Ssl/SSLContextSpi.xml        |  26 +-
 .../en/Javax.Net.Ssl/SSLEngine.xml            |  56 +-
 .../SSLEngineResult+HandshakeStatus.xml       |   4 +-
 .../Javax.Net.Ssl/SSLEngineResult+Status.xml  |   4 +-
 .../en/Javax.Net.Ssl/SSLEngineResult.xml      |   2 +-
 .../en/Javax.Net.Ssl/SSLException.xml         |   4 +-
 .../en/Javax.Net.Ssl/SSLServerSocket.xml      |   2 +-
 .../Javax.Net.Ssl/SSLServerSocketFactory.xml  |   7 +-
 .../Javax.Net.Ssl/SSLSessionBindingEvent.xml  |   2 +-
 .../en/Javax.Net.Ssl/SSLSocket.xml            |  14 +-
 .../en/Javax.Net.Ssl/SSLSocketFactory.xml     |   5 +-
 .../en/Javax.Net.Ssl/TrustManagerFactory.xml  |  20 +-
 .../Javax.Net.Ssl/TrustManagerFactorySpi.xml  |   2 +-
 .../Javax.Net.Ssl/X509ExtendedKeyManager.xml  |   8 +-
 .../X509ExtendedTrustManager.xml              |   2 +-
 .../en/Javax.Net/ServerSocketFactory.xml      |   8 +-
 .../en/Javax.Net/SocketFactory.xml            |  16 +-
 .../en/Javax.Sql/ConnectionEvent.xml          |  18 +-
 .../en/Javax.Sql/ICommonDataSource.xml        |   4 +-
 .../en/Javax.Sql/IConnectionEventListener.xml |  10 +-
 .../Javax.Sql/IConnectionPoolDataSource.xml   |   6 +-
 .../Mono.Android/en/Javax.Sql/IDataSource.xml |   4 +-
 .../en/Javax.Sql/IPooledConnection.xml        |  26 +-
 docs/Mono.Android/en/Javax.Sql/IRowSet.xml    | 307 ++++----
 .../en/Javax.Sql/IRowSetInternal.xml          |  14 +-
 .../en/Javax.Sql/IRowSetListener.xml          |  22 +-
 .../en/Javax.Sql/IRowSetMetaData.xml          |  59 +-
 .../en/Javax.Sql/IRowSetReader.xml            |  10 +-
 .../en/Javax.Sql/IRowSetWriter.xml            |  11 +-
 .../en/Javax.Sql/IStatementEventListener.xml  |  12 +-
 .../Mono.Android/en/Javax.Sql/RowSetEvent.xml |  10 +-
 .../en/Javax.Sql/StatementEvent.xml           |  32 +-
 .../DatatypeConfigurationException.xml        |  12 +-
 .../Javax.Xml.Datatype/DatatypeConstants.xml  |   2 +-
 .../en/Javax.Xml.Datatype/DatatypeFactory.xml | 221 +++---
 .../en/Javax.Xml.Datatype/Duration.xml        |  85 +-
 .../XMLGregorianCalendar.xml                  |  44 +-
 .../Javax.Xml.Namespace/INamespaceContext.xml |   3 +-
 .../en/Javax.Xml.Namespace/QName.xml          |  66 +-
 .../en/Javax.Xml.Parsers/DocumentBuilder.xml  |  17 +-
 .../DocumentBuilderFactory.xml                |  14 +-
 .../FactoryConfigurationError.xml             |  14 +-
 .../ParserConfigurationException.xml          |   6 +-
 .../en/Javax.Xml.Parsers/SAXParser.xml        |   4 +-
 .../en/Javax.Xml.Parsers/SAXParserFactory.xml |   7 +-
 .../en/Javax.Xml.Transform.Dom/DOMResult.xml  |   4 +-
 .../ITransformerHandler.xml                   |   8 +-
 .../en/Javax.Xml.Transform.Sax/SAXResult.xml  |   4 +-
 .../en/Javax.Xml.Transform.Sax/SAXSource.xml  |   6 +-
 .../StreamResult.xml                          |   2 +-
 .../en/Javax.Xml.Transform/IErrorListener.xml |   4 +-
 .../en/Javax.Xml.Transform/Transformer.xml    |  10 +-
 .../TransformerConfigurationException.xml     |  14 +-
 .../TransformerException.xml                  |   2 +-
 .../TransformerFactory.xml                    |  34 +-
 .../TransformerFactoryConfigurationError.xml  |  14 +-
 .../en/Javax.Xml.Validation/SchemaFactory.xml |  26 +-
 .../en/Javax.Xml.Validation/Validator.xml     |   2 +-
 .../en/Javax.Xml.Xpath/IXPath.xml             |  29 +-
 .../en/Javax.Xml.Xpath/IXPathExpression.xml   |  31 +-
 .../en/Javax.Xml.Xpath/IXPathFunction.xml     |   7 +-
 .../IXPathFunctionResolver.xml                |   5 +-
 .../IXPathVariableResolver.xml                |   7 +-
 .../en/Javax.Xml.Xpath/XPathException.xml     |   7 +-
 .../XPathExpressionException.xml              |   7 +-
 .../en/Javax.Xml.Xpath/XPathFactory.xml       |  33 +-
 .../XPathFactoryConfigurationException.xml    |   7 +-
 .../XPathFunctionException.xml                |   7 +-
 .../ISocketFactory.xml                        |  11 +-
 .../SSLSocketFactory.xml                      |   4 +-
 .../AbstractHttpParams.xml                    |   4 +-
 .../en/Org.Apache.Http.Params/IHttpParams.xml |  12 +-
 .../en/Org.W3c.Dom.LS/DOMImplementationLS.xml |   4 +-
 .../Org.W3c.Dom.LS/IDOMImplementationLS.xml   |  73 +-
 .../en/Org.W3c.Dom.LS/ILSParser.xml           |  46 +-
 .../en/Org.W3c.Dom.LS/ILSParserFilter.xml     |  35 +-
 .../en/Org.W3c.Dom.LS/ILSResourceResolver.xml |  17 +-
 .../en/Org.W3c.Dom.LS/ILSSerializer.xml       |  19 +-
 .../en/Org.W3c.Dom.LS/LSException.xml         |   8 +-
 docs/Mono.Android/en/Org.W3c.Dom/DOMError.xml |   6 +-
 .../en/Org.W3c.Dom/DOMException.xml           |  14 +-
 docs/Mono.Android/en/Org.W3c.Dom/IAttr.xml    |   4 +-
 .../en/Org.W3c.Dom/ICharacterData.xml         |  24 +-
 docs/Mono.Android/en/Org.W3c.Dom/IComment.xml |   2 +-
 .../en/Org.W3c.Dom/IDOMConfiguration.xml      |  19 +-
 .../Mono.Android/en/Org.W3c.Dom/IDOMError.xml |   9 +-
 .../en/Org.W3c.Dom/IDOMErrorHandler.xml       |  13 +-
 .../en/Org.W3c.Dom/IDOMImplementation.xml     |  43 +-
 .../en/Org.W3c.Dom/IDOMImplementationList.xml |  10 +-
 .../Org.W3c.Dom/IDOMImplementationSource.xml  |  10 +-
 .../en/Org.W3c.Dom/IDOMLocator.xml            |   3 +-
 .../en/Org.W3c.Dom/IDOMStringList.xml         |  17 +-
 .../Mono.Android/en/Org.W3c.Dom/IDocument.xml | 144 ++--
 .../en/Org.W3c.Dom/IDocumentFragment.xml      |   5 +-
 .../en/Org.W3c.Dom/IDocumentType.xml          |   4 +-
 docs/Mono.Android/en/Org.W3c.Dom/IElement.xml |  72 +-
 .../en/Org.W3c.Dom/IEntityReference.xml       |   3 +-
 .../Mono.Android/en/Org.W3c.Dom/INameList.xml |  28 +-
 .../en/Org.W3c.Dom/INamedNodeMap.xml          |  40 +-
 docs/Mono.Android/en/Org.W3c.Dom/INode.xml    |  98 +--
 .../Mono.Android/en/Org.W3c.Dom/INodeList.xml |   8 +-
 .../en/Org.W3c.Dom/IProcessingInstruction.xml |   2 +-
 docs/Mono.Android/en/Org.W3c.Dom/IText.xml    |  12 +-
 .../Mono.Android/en/Org.W3c.Dom/ITypeInfo.xml |  14 +-
 .../en/Org.W3c.Dom/IUserDataHandler.xml       |  16 +-
 docs/Mono.Android/en/Org.W3c.Dom/Node.xml     |  24 +-
 .../en/Org.W3c.Dom/UserDataHandler.xml        |   8 +-
 .../en/Org.Xmlpull.V1.Sax2/Driver.xml         |   2 +-
 docs/Mono.Android/en/index.xml                |   2 +-
 1024 files changed, 7314 insertions(+), 6925 deletions(-)

diff --git a/docs/Mono.Android/en/Android.AccessibilityServices/AccessibilityGestureEvent+InterfaceConsts.xml b/docs/Mono.Android/en/Android.AccessibilityServices/AccessibilityGestureEvent+InterfaceConsts.xml
index 0248504319..8729bc03f1 100644
--- a/docs/Mono.Android/en/Android.AccessibilityServices/AccessibilityGestureEvent+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.AccessibilityServices/AccessibilityGestureEvent+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.AccessibilityServices/AccessibilityServiceInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.AccessibilityServices/AccessibilityServiceInfo+InterfaceConsts.xml
index 061955ad98..caf68ad6cb 100644
--- a/docs/Mono.Android/en/Android.AccessibilityServices/AccessibilityServiceInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.AccessibilityServices/AccessibilityServiceInfo+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Accounts/Account+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Accounts/Account+InterfaceConsts.xml
index 0d27d263cf..e91c39e278 100644
--- a/docs/Mono.Android/en/Android.Accounts/Account+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Accounts/Account+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Accounts/AccountAuthenticatorResponse+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Accounts/AccountAuthenticatorResponse+InterfaceConsts.xml
index 3be2b581f8..d576c98f1c 100644
--- a/docs/Mono.Android/en/Android.Accounts/AccountAuthenticatorResponse+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Accounts/AccountAuthenticatorResponse+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Accounts/AuthenticatorDescription+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Accounts/AuthenticatorDescription+InterfaceConsts.xml
index 8c545f8e5c..f652f73aaf 100644
--- a/docs/Mono.Android/en/Android.Accounts/AuthenticatorDescription+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Accounts/AuthenticatorDescription+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Animation/Animator.xml b/docs/Mono.Android/en/Android.Animation/Animator.xml
index 833370a17b..b59553fb6b 100644
--- a/docs/Mono.Android/en/Android.Animation/Animator.xml
+++ b/docs/Mono.Android/en/Android.Animation/Animator.xml
@@ -32,7 +32,7 @@
   </Attributes>
   <Docs since="11">
     <summary>This is the superclass for classes which provide basic support for animations which can be
-            started, ended, and have &lt;code&gt;AnimatorListeners&lt;/code&gt; added to them.</summary>
+            started, ended, and have <c>AnimatorListeners</c> added to them.</summary>
     <remarks>
       <para>
         <format type="text/html">
@@ -661,7 +661,7 @@
       </ReturnValue>
       <Docs>
         <summary>Gets the set of <c>android.animation.Animator.AnimatorListener</c> objects that are currently
-            listening for events on this &lt;code&gt;Animator&lt;/code&gt; object.</summary>
+            listening for events on this <c>Animator</c> object.</summary>
         <value>ArrayList&lt;AnimatorListener&gt; The set of listeners.</value>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Animation/AnimatorSet+Builder.xml b/docs/Mono.Android/en/Android.Animation/AnimatorSet+Builder.xml
index 5eca9dc2b1..177d5a2017 100644
--- a/docs/Mono.Android/en/Android.Animation/AnimatorSet+Builder.xml
+++ b/docs/Mono.Android/en/Android.Animation/AnimatorSet+Builder.xml
@@ -18,8 +18,8 @@
     </Attribute>
   </Attributes>
   <Docs>
-    <summary>The &lt;code&gt;Builder&lt;/code&gt; object is a utility class to facilitate adding animations to a
-            &lt;code&gt;AnimatorSet&lt;/code&gt; along with the relationships between the various animations.</summary>
+    <summary>The <c>Builder</c> object is a utility class to facilitate adding animations to a
+            <c>AnimatorSet</c> along with the relationships between the various animations.</summary>
     <remarks>
       <para>
         <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Animation/BidirectionalTypeConverter.xml b/docs/Mono.Android/en/Android.Animation/BidirectionalTypeConverter.xml
index b0fbc415b4..00076ca2bd 100644
--- a/docs/Mono.Android/en/Android.Animation/BidirectionalTypeConverter.xml
+++ b/docs/Mono.Android/en/Android.Animation/BidirectionalTypeConverter.xml
@@ -114,7 +114,7 @@
       <Docs>
         <param name="value">The Object to convert.</param>
         <summary>Does a conversion from the target type back to the source type.</summary>
-        <returns>A value of type T, converted from &lt;code&gt;value&lt;/code&gt;.</returns>
+        <returns>A value of type T, converted from <c>value</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Animation/FloatArrayEvaluator.xml b/docs/Mono.Android/en/Android.Animation/FloatArrayEvaluator.xml
index 1124440a83..ef66a561dd 100644
--- a/docs/Mono.Android/en/Android.Animation/FloatArrayEvaluator.xml
+++ b/docs/Mono.Android/en/Android.Animation/FloatArrayEvaluator.xml
@@ -31,7 +31,7 @@
     </Attribute>
   </Attributes>
   <Docs since="21">
-    <summary>This evaluator can be used to perform type interpolation between &lt;code&gt;float[]&lt;/code&gt; values.</summary>
+    <summary>This evaluator can be used to perform type interpolation between <c>float[]</c> values.</summary>
     <remarks>
       <para>
         <format type="text/html">
@@ -99,8 +99,8 @@
         <Parameter Name="reuseArray" Type="System.Single[]" />
       </Parameters>
       <Docs>
-        <param name="reuseArray">The array to modify and return from &lt;code&gt;evaluate&lt;/code&gt;.</param>
-        <summary>Create a FloatArrayEvaluator that reuses &lt;code&gt;reuseArray&lt;/code&gt; for every evaluate() call.</summary>
+        <param name="reuseArray">The array to modify and return from <c>evaluate</c>.</param>
+        <summary>Create a FloatArrayEvaluator that reuses <c>reuseArray</c> for every evaluate() call.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -199,7 +199,7 @@
         <param name="startValue">The start value.</param>
         <param name="endValue">The end value.</param>
         <summary>Interpolates the value at each index by the fraction.</summary>
-        <returns>A &lt;code&gt;float[]&lt;/code&gt; where each element is an interpolation between
+        <returns>A <c>float[]</c> where each element is an interpolation between
                     the same index in startValue and endValue.</returns>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Animation/FloatEvaluator.xml b/docs/Mono.Android/en/Android.Animation/FloatEvaluator.xml
index 5a2e949f8b..02d5962fd8 100644
--- a/docs/Mono.Android/en/Android.Animation/FloatEvaluator.xml
+++ b/docs/Mono.Android/en/Android.Animation/FloatEvaluator.xml
@@ -31,7 +31,7 @@
     </Attribute>
   </Attributes>
   <Docs since="11">
-    <summary>This evaluator can be used to perform type interpolation between &lt;code&gt;float&lt;/code&gt; values.</summary>
+    <summary>This evaluator can be used to perform type interpolation between <c>float</c> values.</summary>
     <remarks>
       <para>
         <format type="text/html">
@@ -121,13 +121,13 @@
       </Parameters>
       <Docs>
         <param name="fraction">The fraction from the starting to the ending values</param>
-        <param name="startValue">The start value; should be of type &lt;code&gt;float&lt;/code&gt; or
-                              &lt;code&gt;Float&lt;/code&gt;</param>
-        <param name="endValue">The end value; should be of type &lt;code&gt;float&lt;/code&gt; or &lt;code&gt;Float&lt;/code&gt;</param>
+        <param name="startValue">The start value; should be of type <c>float</c> or
+                              <c>Float</c></param>
+        <param name="endValue">The end value; should be of type <c>float</c> or <c>Float</c></param>
         <summary>This function returns the result of linearly interpolating the start and end values, with
-            &lt;code&gt;fraction&lt;/code&gt; representing the proportion between the start and end values.</summary>
+            <c>fraction</c> representing the proportion between the start and end values.</summary>
         <returns>A linear interpolation between the start and end values, given the
-                    &lt;code&gt;fraction&lt;/code&gt; parameter.</returns>
+                    <c>fraction</c> parameter.</returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Animation/ITypeEvaluator.xml b/docs/Mono.Android/en/Android.Animation/ITypeEvaluator.xml
index 182de279f0..5384cb3f84 100644
--- a/docs/Mono.Android/en/Android.Animation/ITypeEvaluator.xml
+++ b/docs/Mono.Android/en/Android.Animation/ITypeEvaluator.xml
@@ -70,9 +70,9 @@
         <param name="startValue">The start value.</param>
         <param name="endValue">The end value.</param>
         <summary>This function returns the result of linearly interpolating the start and end values, with
-            &lt;code&gt;fraction&lt;/code&gt; representing the proportion between the start and end values.</summary>
+            <c>fraction</c> representing the proportion between the start and end values.</summary>
         <returns>A linear interpolation between the start and end values, given the
-                    &lt;code&gt;fraction&lt;/code&gt; parameter.</returns>
+                    <c>fraction</c> parameter.</returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Animation/IntArrayEvaluator.xml b/docs/Mono.Android/en/Android.Animation/IntArrayEvaluator.xml
index 6219322bcd..aeda54d5be 100644
--- a/docs/Mono.Android/en/Android.Animation/IntArrayEvaluator.xml
+++ b/docs/Mono.Android/en/Android.Animation/IntArrayEvaluator.xml
@@ -31,7 +31,7 @@
     </Attribute>
   </Attributes>
   <Docs since="21">
-    <summary>This evaluator can be used to perform type interpolation between &lt;code&gt;int[]&lt;/code&gt; values.</summary>
+    <summary>This evaluator can be used to perform type interpolation between <c>int[]</c> values.</summary>
     <remarks>
       <para>
         <format type="text/html">
@@ -99,8 +99,8 @@
         <Parameter Name="reuseArray" Type="System.Int32[]" />
       </Parameters>
       <Docs>
-        <param name="reuseArray">The array to modify and return from &lt;code&gt;evaluate&lt;/code&gt;.</param>
-        <summary>Create an IntArrayEvaluator that reuses &lt;code&gt;reuseArray&lt;/code&gt; for every evaluate() call.</summary>
+        <param name="reuseArray">The array to modify and return from <c>evaluate</c>.</param>
+        <summary>Create an IntArrayEvaluator that reuses <c>reuseArray</c> for every evaluate() call.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -199,7 +199,7 @@
         <param name="startValue">The start value.</param>
         <param name="endValue">The end value.</param>
         <summary>Interpolates the value at each index by the fraction.</summary>
-        <returns>An &lt;code&gt;int[]&lt;/code&gt; where each element is an interpolation between
+        <returns>An <c>int[]</c> where each element is an interpolation between
                     the same index in startValue and endValue.</returns>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Animation/IntEvaluator.xml b/docs/Mono.Android/en/Android.Animation/IntEvaluator.xml
index 8f27802211..ca058eeba8 100644
--- a/docs/Mono.Android/en/Android.Animation/IntEvaluator.xml
+++ b/docs/Mono.Android/en/Android.Animation/IntEvaluator.xml
@@ -31,7 +31,7 @@
     </Attribute>
   </Attributes>
   <Docs since="11">
-    <summary>This evaluator can be used to perform type interpolation between &lt;code&gt;int&lt;/code&gt; values.</summary>
+    <summary>This evaluator can be used to perform type interpolation between <c>int</c> values.</summary>
     <remarks>
       <para>
         <format type="text/html">
@@ -121,13 +121,13 @@
       </Parameters>
       <Docs>
         <param name="fraction">The fraction from the starting to the ending values</param>
-        <param name="startValue">The start value; should be of type &lt;code&gt;int&lt;/code&gt; or
-                              &lt;code&gt;Integer&lt;/code&gt;</param>
-        <param name="endValue">The end value; should be of type &lt;code&gt;int&lt;/code&gt; or &lt;code&gt;Integer&lt;/code&gt;</param>
+        <param name="startValue">The start value; should be of type <c>int</c> or
+                              <c>Integer</c></param>
+        <param name="endValue">The end value; should be of type <c>int</c> or <c>Integer</c></param>
         <summary>This function returns the result of linearly interpolating the start and end values, with
-            &lt;code&gt;fraction&lt;/code&gt; representing the proportion between the start and end values.</summary>
+            <c>fraction</c> representing the proportion between the start and end values.</summary>
         <returns>A linear interpolation between the start and end values, given the
-                    &lt;code&gt;fraction&lt;/code&gt; parameter.</returns>
+                    <c>fraction</c> parameter.</returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Animation/LayoutTransition.xml b/docs/Mono.Android/en/Android.Animation/LayoutTransition.xml
index 84a84be933..01839bd9a1 100644
--- a/docs/Mono.Android/en/Android.Animation/LayoutTransition.xml
+++ b/docs/Mono.Android/en/Android.Animation/LayoutTransition.xml
@@ -1165,7 +1165,7 @@
         <param name="transitionType">One of <c>#CHANGE_APPEARING</c>, <c>#CHANGE_DISAPPEARING</c>,
             <c>#CHANGING</c>, <c>#APPEARING</c>, or <c>#DISAPPEARING</c>, which determines the
             animation whose animator is being set.</param>
-        <param name="animator">The animation being assigned. A value of &lt;code&gt;null&lt;/code&gt; means that no
+        <param name="animator">The animation being assigned. A value of <c>null</c> means that no
             animation will be run for the specified transitionType.</param>
         <summary>Sets the animation used during one of the transition types that may run.</summary>
         <remarks>
diff --git a/docs/Mono.Android/en/Android.Animation/ObjectAnimator.xml b/docs/Mono.Android/en/Android.Animation/ObjectAnimator.xml
index 44afb5dda2..eb42edfcc6 100644
--- a/docs/Mono.Android/en/Android.Animation/ObjectAnimator.xml
+++ b/docs/Mono.Android/en/Android.Animation/ObjectAnimator.xml
@@ -186,8 +186,8 @@
       </Parameters>
       <Docs>
         <param name="target">The object whose property is to be animated. This object should
-            have a public method on it called &lt;code&gt;setName()&lt;/code&gt;, where &lt;code&gt;name&lt;/code&gt; is
-            the value of the &lt;code&gt;propertyName&lt;/code&gt; parameter.</param>
+            have a public method on it called <c>setName()</c>, where <c>name</c> is
+            the value of the <c>propertyName</c> parameter.</param>
         <param name="propertyName">The name of the property being animated.</param>
         <param name="values">A set of values that the animation will animate between over time.</param>
         <summary>Constructs and returns an ObjectAnimator that animates between color values.</summary>
@@ -295,8 +295,8 @@
       </Parameters>
       <Docs>
         <param name="target">The object whose property is to be animated. This object should
-            have a public method on it called &lt;code&gt;setName()&lt;/code&gt;, where &lt;code&gt;name&lt;/code&gt; is
-            the value of the &lt;code&gt;propertyName&lt;/code&gt; parameter.</param>
+            have a public method on it called <c>setName()</c>, where <c>name</c> is
+            the value of the <c>propertyName</c> parameter.</param>
         <param name="propertyName">The name of the property being animated.</param>
         <param name="values">A set of values that the animation will animate between over time.</param>
         <summary>Constructs and returns an ObjectAnimator that animates between float values.</summary>
@@ -348,10 +348,10 @@
         <param name="target">The object whose properties are to be animated.</param>
         <param name="xProperty">The property for the x coordinate being animated.</param>
         <param name="yProperty">The property for the y coordinate being animated.</param>
-        <param name="path">The &lt;code&gt;Path&lt;/code&gt; to animate values along.</param>
-        <summary>Constructs and returns an ObjectAnimator that animates coordinates along a &lt;code&gt;Path&lt;/code&gt;
+        <param name="path">The <c>Path</c> to animate values along.</param>
+        <summary>Constructs and returns an ObjectAnimator that animates coordinates along a <c>Path</c>
             using two properties.</summary>
-        <returns>An ObjectAnimator object that is set up to animate along &lt;code&gt;path&lt;/code&gt;.</returns>
+        <returns>An ObjectAnimator object that is set up to animate along <c>path</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -393,16 +393,16 @@
       </Parameters>
       <Docs>
         <param name="target">The object whose properties are to be animated. This object should
-                          have public methods on it called &lt;code&gt;setNameX()&lt;/code&gt; and
-                          &lt;code&gt;setNameY&lt;/code&gt;, where &lt;code&gt;nameX&lt;/code&gt; and &lt;code&gt;nameY&lt;/code&gt;
-                          are the value of the &lt;code&gt;xPropertyName&lt;/code&gt; and &lt;code&gt;yPropertyName&lt;/code&gt;
+                          have public methods on it called <c>setNameX()</c> and
+                          <c>setNameY</c>, where <c>nameX</c> and <c>nameY</c>
+                          are the value of the <c>xPropertyName</c> and <c>yPropertyName</c>
                           parameters, respectively.</param>
         <param name="xPropertyName">The name of the property for the x coordinate being animated.</param>
         <param name="yPropertyName">The name of the property for the y coordinate being animated.</param>
-        <param name="path">The &lt;code&gt;Path&lt;/code&gt; to animate values along.</param>
-        <summary>Constructs and returns an ObjectAnimator that animates coordinates along a &lt;code&gt;Path&lt;/code&gt;
+        <param name="path">The <c>Path</c> to animate values along.</param>
+        <summary>Constructs and returns an ObjectAnimator that animates coordinates along a <c>Path</c>
             using two properties.</summary>
-        <returns>An ObjectAnimator object that is set up to animate along &lt;code&gt;path&lt;/code&gt;.</returns>
+        <returns>An ObjectAnimator object that is set up to animate along <c>path</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -505,8 +505,8 @@
       </Parameters>
       <Docs>
         <param name="target">The object whose property is to be animated. This object should
-            have a public method on it called &lt;code&gt;setName()&lt;/code&gt;, where &lt;code&gt;name&lt;/code&gt; is
-            the value of the &lt;code&gt;propertyName&lt;/code&gt; parameter.</param>
+            have a public method on it called <c>setName()</c>, where <c>name</c> is
+            the value of the <c>propertyName</c> parameter.</param>
         <param name="propertyName">The name of the property being animated.</param>
         <param name="values">A set of values that the animation will animate between over time.</param>
         <summary>Constructs and returns an ObjectAnimator that animates between int values.</summary>
@@ -558,10 +558,10 @@
         <param name="target">The object whose properties are to be animated.</param>
         <param name="xProperty">The property for the x coordinate being animated.</param>
         <param name="yProperty">The property for the y coordinate being animated.</param>
-        <param name="path">The &lt;code&gt;Path&lt;/code&gt; to animate values along.</param>
-        <summary>Constructs and returns an ObjectAnimator that animates coordinates along a &lt;code&gt;Path&lt;/code&gt;
+        <param name="path">The <c>Path</c> to animate values along.</param>
+        <summary>Constructs and returns an ObjectAnimator that animates coordinates along a <c>Path</c>
             using two properties.</summary>
-        <returns>An ObjectAnimator object that is set up to animate along &lt;code&gt;path&lt;/code&gt;.</returns>
+        <returns>An ObjectAnimator object that is set up to animate along <c>path</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -603,16 +603,16 @@
       </Parameters>
       <Docs>
         <param name="target">The object whose properties are to be animated. This object should
-                          have public methods on it called &lt;code&gt;setNameX()&lt;/code&gt; and
-                          &lt;code&gt;setNameY&lt;/code&gt;, where &lt;code&gt;nameX&lt;/code&gt; and &lt;code&gt;nameY&lt;/code&gt;
-                          are the value of &lt;code&gt;xPropertyName&lt;/code&gt; and &lt;code&gt;yPropertyName&lt;/code&gt;
+                          have public methods on it called <c>setNameX()</c> and
+                          <c>setNameY</c>, where <c>nameX</c> and <c>nameY</c>
+                          are the value of <c>xPropertyName</c> and <c>yPropertyName</c>
                           parameters, respectively.</param>
         <param name="xPropertyName">The name of the property for the x coordinate being animated.</param>
         <param name="yPropertyName">The name of the property for the y coordinate being animated.</param>
-        <param name="path">The &lt;code&gt;Path&lt;/code&gt; to animate values along.</param>
-        <summary>Constructs and returns an ObjectAnimator that animates coordinates along a &lt;code&gt;Path&lt;/code&gt;
+        <param name="path">The <c>Path</c> to animate values along.</param>
+        <summary>Constructs and returns an ObjectAnimator that animates coordinates along a <c>Path</c>
             using two properties.</summary>
-        <returns>An ObjectAnimator object that is set up to animate along &lt;code&gt;path&lt;/code&gt;.</returns>
+        <returns>An ObjectAnimator object that is set up to animate along <c>path</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -653,14 +653,14 @@
       </Parameters>
       <Docs>
         <param name="target">The object whose property is to be animated. This object may
-            have a public method on it called &lt;code&gt;setName()&lt;/code&gt;, where &lt;code&gt;name&lt;/code&gt; is
-            the value of the &lt;code&gt;propertyName&lt;/code&gt; parameter. &lt;code&gt;propertyName&lt;/code&gt; may also
+            have a public method on it called <c>setName()</c>, where <c>name</c> is
+            the value of the <c>propertyName</c> parameter. <c>propertyName</c> may also
             be the case-sensitive complete name of the public setter method.</param>
         <param name="propertyName">The name of the property being animated or the name of the setter method.</param>
-        <param name="path">The &lt;code&gt;Path&lt;/code&gt; to animate values along.</param>
+        <param name="path">The <c>Path</c> to animate values along.</param>
         <summary>Constructs and returns an ObjectAnimator that animates the target using a multi-float setter
-            along the given &lt;code&gt;Path&lt;/code&gt;.</summary>
-        <returns>An ObjectAnimator object that is set up to animate along &lt;code&gt;path&lt;/code&gt;.</returns>
+            along the given <c>Path</c>.</summary>
+        <returns>An ObjectAnimator object that is set up to animate along <c>path</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -701,8 +701,8 @@
       </Parameters>
       <Docs>
         <param name="target">The object whose property is to be animated. This object may
-            have a public method on it called &lt;code&gt;setName()&lt;/code&gt;, where &lt;code&gt;name&lt;/code&gt; is
-            the value of the &lt;code&gt;propertyName&lt;/code&gt; parameter. &lt;code&gt;propertyName&lt;/code&gt; may also
+            have a public method on it called <c>setName()</c>, where <c>name</c> is
+            the value of the <c>propertyName</c> parameter. <c>propertyName</c> may also
             be the case-sensitive complete name of the public setter method.</param>
         <param name="propertyName">The name of the property being animated or the name of the setter method.</param>
         <param name="values">A set of values that the animation will animate between over time.</param>
@@ -762,8 +762,8 @@
       </Parameters>
       <Docs>
         <param name="target">The object whose property is to be animated. This object may
-            have a public method on it called &lt;code&gt;setName()&lt;/code&gt;, where &lt;code&gt;name&lt;/code&gt; is
-            the value of the &lt;code&gt;propertyName&lt;/code&gt; parameter. &lt;code&gt;propertyName&lt;/code&gt; may also
+            have a public method on it called <c>setName()</c>, where <c>name</c> is
+            the value of the <c>propertyName</c> parameter. <c>propertyName</c> may also
             be the case-sensitive complete name of the public setter method.</param>
         <param name="propertyName">The name of the property being animated or the name of the setter method.</param>
         <param name="converter">Converts T objects into float parameters for the multi-value setter.</param>
@@ -814,14 +814,14 @@
       </Parameters>
       <Docs>
         <param name="target">The object whose property is to be animated. This object may
-            have a public method on it called &lt;code&gt;setName()&lt;/code&gt;, where &lt;code&gt;name&lt;/code&gt; is
-            the value of the &lt;code&gt;propertyName&lt;/code&gt; parameter. &lt;code&gt;propertyName&lt;/code&gt; may also
+            have a public method on it called <c>setName()</c>, where <c>name</c> is
+            the value of the <c>propertyName</c> parameter. <c>propertyName</c> may also
             be the case-sensitive complete name of the public setter method.</param>
         <param name="propertyName">The name of the property being animated or the name of the setter method.</param>
-        <param name="path">The &lt;code&gt;Path&lt;/code&gt; to animate values along.</param>
+        <param name="path">The <c>Path</c> to animate values along.</param>
         <summary>Constructs and returns an ObjectAnimator that animates the target using a multi-int setter
-            along the given &lt;code&gt;Path&lt;/code&gt;.</summary>
-        <returns>An ObjectAnimator object that is set up to animate along &lt;code&gt;path&lt;/code&gt;.</returns>
+            along the given <c>Path</c>.</summary>
+        <returns>An ObjectAnimator object that is set up to animate along <c>path</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -862,8 +862,8 @@
       </Parameters>
       <Docs>
         <param name="target">The object whose property is to be animated. This object may
-            have a public method on it called &lt;code&gt;setName()&lt;/code&gt;, where &lt;code&gt;name&lt;/code&gt; is
-            the value of the &lt;code&gt;propertyName&lt;/code&gt; parameter. &lt;code&gt;propertyName&lt;/code&gt; may also
+            have a public method on it called <c>setName()</c>, where <c>name</c> is
+            the value of the <c>propertyName</c> parameter. <c>propertyName</c> may also
             be the case-sensitive complete name of the public setter method.</param>
         <param name="propertyName">The name of the property being animated or the name of the setter method.</param>
         <param name="values">A set of values that the animation will animate between over time.</param>
@@ -923,8 +923,8 @@
       </Parameters>
       <Docs>
         <param name="target">The object whose property is to be animated. This object may
-            have a public method on it called &lt;code&gt;setName()&lt;/code&gt;, where &lt;code&gt;name&lt;/code&gt; is
-            the value of the &lt;code&gt;propertyName&lt;/code&gt; parameter. &lt;code&gt;propertyName&lt;/code&gt; may also
+            have a public method on it called <c>setName()</c>, where <c>name</c> is
+            the value of the <c>propertyName</c> parameter. <c>propertyName</c> may also
             be the case-sensitive complete name of the public setter method.</param>
         <param name="propertyName">The name of the property being animated or the name of the setter method.</param>
         <param name="converter">Converts T objects into int parameters for the multi-value setter.</param>
@@ -1042,9 +1042,9 @@
         <param name="property">The property being animated. Should not be null.</param>
         <param name="converter">Converts a PointF to the type associated with the setter. May be
                              null if conversion is unnecessary.</param>
-        <param name="path">The &lt;code&gt;Path&lt;/code&gt; to animate values along.</param>
-        <summary>Constructs and returns an ObjectAnimator that animates a property along a &lt;code&gt;Path&lt;/code&gt;.</summary>
-        <returns>An ObjectAnimator object that is set up to animate along &lt;code&gt;path&lt;/code&gt;.</returns>
+        <param name="path">The <c>Path</c> to animate values along.</param>
+        <summary>Constructs and returns an ObjectAnimator that animates a property along a <c>Path</c>.</summary>
+        <returns>An ObjectAnimator object that is set up to animate along <c>path</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1141,14 +1141,14 @@
       </Parameters>
       <Docs>
         <param name="target">The object whose property is to be animated. This object should
-            have a public method on it called &lt;code&gt;setName()&lt;/code&gt;, where &lt;code&gt;name&lt;/code&gt; is
-            the value of the &lt;code&gt;propertyName&lt;/code&gt; parameter.</param>
+            have a public method on it called <c>setName()</c>, where <c>name</c> is
+            the value of the <c>propertyName</c> parameter.</param>
         <param name="propertyName">The name of the property being animated.</param>
         <param name="converter">Converts a PointF to the type associated with the setter. May be
                              null if conversion is unnecessary.</param>
-        <param name="path">The &lt;code&gt;Path&lt;/code&gt; to animate values along.</param>
-        <summary>Constructs and returns an ObjectAnimator that animates a property along a &lt;code&gt;Path&lt;/code&gt;.</summary>
-        <returns>An ObjectAnimator object that is set up to animate along &lt;code&gt;path&lt;/code&gt;.</returns>
+        <param name="path">The <c>Path</c> to animate values along.</param>
+        <summary>Constructs and returns an ObjectAnimator that animates a property along a <c>Path</c>.</summary>
+        <returns>An ObjectAnimator object that is set up to animate along <c>path</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Animation/PointFEvaluator.xml b/docs/Mono.Android/en/Android.Animation/PointFEvaluator.xml
index 9c28d4227e..9042faa167 100644
--- a/docs/Mono.Android/en/Android.Animation/PointFEvaluator.xml
+++ b/docs/Mono.Android/en/Android.Animation/PointFEvaluator.xml
@@ -31,7 +31,7 @@
     </Attribute>
   </Attributes>
   <Docs since="21">
-    <summary>This evaluator can be used to perform type interpolation between &lt;code&gt;PointF&lt;/code&gt; values.</summary>
+    <summary>This evaluator can be used to perform type interpolation between <c>PointF</c> values.</summary>
     <remarks>
       <para>
         <format type="text/html">
@@ -99,7 +99,7 @@
       </Parameters>
       <Docs>
         <param name="reuse">A PointF to be modified and returned by evaluate.</param>
-        <summary>Constructs a PointFEvaluator that modifies and returns &lt;code&gt;reuse&lt;/code&gt;
+        <summary>Constructs a PointFEvaluator that modifies and returns <c>reuse</c>
             in <c>#evaluate(float, android.graphics.PointF, android.graphics.PointF)</c> calls.</summary>
         <remarks>
           <para>
@@ -199,10 +199,10 @@
         <param name="startValue">The start PointF</param>
         <param name="endValue">The end PointF</param>
         <summary>This function returns the result of linearly interpolating the start and
-            end PointF values, with &lt;code&gt;fraction&lt;/code&gt; representing the proportion
+            end PointF values, with <c>fraction</c> representing the proportion
             between the start and end values.</summary>
         <returns>A linear interpolation between the start and end values, given the
-                    &lt;code&gt;fraction&lt;/code&gt; parameter.</returns>
+                    <c>fraction</c> parameter.</returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Animation/PropertyValuesHolder.xml b/docs/Mono.Android/en/Android.Animation/PropertyValuesHolder.xml
index 656a68859c..1f8bfb93ec 100644
--- a/docs/Mono.Android/en/Android.Animation/PropertyValuesHolder.xml
+++ b/docs/Mono.Android/en/Android.Animation/PropertyValuesHolder.xml
@@ -460,7 +460,7 @@
       <Docs>
         <param name="propertyName">The name of the property being animated. Can also be the
                                 case-sensitive name of the entire setter method. Should not be null.
-                                The setter must take exactly two &lt;code&gt;float&lt;/code&gt; parameters.</param>
+                                The setter must take exactly two <c>float</c> parameters.</param>
         <param name="path">The Path along which the values should be animated.</param>
         <summary>Constructs and returns a PropertyValuesHolder with a given property name to use
             as a multi-float setter.</summary>
@@ -507,7 +507,7 @@
                                 case-sensitive name of the entire setter method. Should not be null.</param>
         <param name="values">The values that the property will animate between.</param>
         <summary>Constructs and returns a PropertyValuesHolder with a given property name and
-            set of &lt;code&gt;float[]&lt;/code&gt; values.</summary>
+            set of <c>float[]</c> values.</summary>
         <returns>PropertyValuesHolder The constructed PropertyValuesHolder object.</returns>
         <remarks>
           <para>
@@ -671,7 +671,7 @@
       <Docs>
         <param name="propertyName">The name of the property being animated. Can also be the
                                 case-sensitive name of the entire setter method. Should not be null.
-                                The setter must take exactly two &lt;code&gt;int&lt;/code&gt; parameters.</param>
+                                The setter must take exactly two <c>int</c> parameters.</param>
         <param name="path">The Path along which the values should be animated.</param>
         <summary>Constructs and returns a PropertyValuesHolder with a given property name to use
             as a multi-int setter.</summary>
@@ -718,7 +718,7 @@
                                 case-sensitive name of the entire setter method. Should not be null.</param>
         <param name="values">The values that the property will animate between.</param>
         <summary>Constructs and returns a PropertyValuesHolder with a given property name and
-            set of &lt;code&gt;int[]&lt;/code&gt; values.</summary>
+            set of <c>int[]</c> values.</summary>
         <returns>PropertyValuesHolder The constructed PropertyValuesHolder object.</returns>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Animation/RectEvaluator.xml b/docs/Mono.Android/en/Android.Animation/RectEvaluator.xml
index d5321416ef..e11083b18f 100644
--- a/docs/Mono.Android/en/Android.Animation/RectEvaluator.xml
+++ b/docs/Mono.Android/en/Android.Animation/RectEvaluator.xml
@@ -31,7 +31,7 @@
     </Attribute>
   </Attributes>
   <Docs since="18">
-    <summary>This evaluator can be used to perform type interpolation between &lt;code&gt;Rect&lt;/code&gt; values.</summary>
+    <summary>This evaluator can be used to perform type interpolation between <c>Rect</c> values.</summary>
     <remarks>
       <para>
         <format type="text/html">
@@ -101,7 +101,7 @@
       </Parameters>
       <Docs>
         <param name="reuseRect">A Rect to be modified and returned by evaluate.</param>
-        <summary>Constructs a RectEvaluator that modifies and returns &lt;code&gt;reuseRect&lt;/code&gt;
+        <summary>Constructs a RectEvaluator that modifies and returns <c>reuseRect</c>
             in <c>#evaluate(float, android.graphics.Rect, android.graphics.Rect)</c> calls.</summary>
         <remarks>
           <para>
@@ -201,10 +201,10 @@
         <param name="startValue">The start Rect</param>
         <param name="endValue">The end Rect</param>
         <summary>This function returns the result of linearly interpolating the start and
-            end Rect values, with &lt;code&gt;fraction&lt;/code&gt; representing the proportion
+            end Rect values, with <c>fraction</c> representing the proportion
             between the start and end values.</summary>
         <returns>A linear interpolation between the start and end values, given the
-                    &lt;code&gt;fraction&lt;/code&gt; parameter.</returns>
+                    <c>fraction</c> parameter.</returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Animation/TimeAnimator+ITimeListener.xml b/docs/Mono.Android/en/Android.Animation/TimeAnimator+ITimeListener.xml
index a3b78c793e..b8a71aa40f 100644
--- a/docs/Mono.Android/en/Android.Animation/TimeAnimator+ITimeListener.xml
+++ b/docs/Mono.Android/en/Android.Animation/TimeAnimator+ITimeListener.xml
@@ -26,7 +26,7 @@
   </Attributes>
   <Docs>
     <summary>Implementors of this interface can set themselves as update listeners
-            to a &lt;code&gt;TimeAnimator&lt;/code&gt; instance to receive callbacks on every animation
+            to a <c>TimeAnimator</c> instance to receive callbacks on every animation
             frame to receive the total time since the animator started and the delta time
             since the last frame.</summary>
     <remarks>
diff --git a/docs/Mono.Android/en/Android.Animation/TypeConverter.xml b/docs/Mono.Android/en/Android.Animation/TypeConverter.xml
index 4718f03f16..39902adf7e 100644
--- a/docs/Mono.Android/en/Android.Animation/TypeConverter.xml
+++ b/docs/Mono.Android/en/Android.Animation/TypeConverter.xml
@@ -114,7 +114,7 @@
       <Docs>
         <param name="value">The Object to convert.</param>
         <summary>Converts a value from one type to another.</summary>
-        <returns>A value of type V, converted from &lt;code&gt;value&lt;/code&gt;.</returns>
+        <returns>A value of type V, converted from <c>value</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Animation/ValueAnimator+IAnimatorUpdateListener.xml b/docs/Mono.Android/en/Android.Animation/ValueAnimator+IAnimatorUpdateListener.xml
index 4bc594214c..4ef01ea546 100644
--- a/docs/Mono.Android/en/Android.Animation/ValueAnimator+IAnimatorUpdateListener.xml
+++ b/docs/Mono.Android/en/Android.Animation/ValueAnimator+IAnimatorUpdateListener.xml
@@ -26,9 +26,9 @@
   </Attributes>
   <Docs>
     <summary>Implementors of this interface can add themselves as update listeners
-            to an &lt;code&gt;ValueAnimator&lt;/code&gt; instance to receive callbacks on every animation
+            to an <c>ValueAnimator</c> instance to receive callbacks on every animation
             frame, after the current frame's values have been calculated for that
-            &lt;code&gt;ValueAnimator&lt;/code&gt;.</summary>
+            <c>ValueAnimator</c>.</summary>
     <remarks>
       <para>
         <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Animation/ValueAnimator.xml b/docs/Mono.Android/en/Android.Animation/ValueAnimator.xml
index c6fe3978f1..90dfc19edb 100644
--- a/docs/Mono.Android/en/Android.Animation/ValueAnimator.xml
+++ b/docs/Mono.Android/en/Android.Animation/ValueAnimator.xml
@@ -190,9 +190,9 @@
         <ReturnType>Java.Lang.Object</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>The most recent value calculated by this &lt;code&gt;ValueAnimator&lt;/code&gt; when there is just one
+        <summary>The most recent value calculated by this <c>ValueAnimator</c> when there is just one
             property being animated.</summary>
-        <value>animatedValue The value most recently calculated by this &lt;code&gt;ValueAnimator&lt;/code&gt; for
+        <value>animatedValue The value most recently calculated by this <c>ValueAnimator</c> for
             the single property being animated. If there are several properties being animated
             (specified by several PropertyValuesHolder objects in the constructor), this function
             returns the animated value for the first of those objects.</value>
@@ -234,7 +234,7 @@
       <Docs>
         <summary>Returns whether animators are currently enabled, system-wide.</summary>
         <returns>boolean Whether animators are currently enabled. The default value is
-            &lt;code&gt;true&lt;/code&gt;.</returns>
+            <c>true</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -409,9 +409,9 @@
       </Parameters>
       <Docs>
         <param name="propertyName">To be added.</param>
-        <summary>The most recent value calculated by this &lt;code&gt;ValueAnimator&lt;/code&gt; for &lt;code&gt;propertyName&lt;/code&gt;.</summary>
+        <summary>The most recent value calculated by this <c>ValueAnimator</c> for <c>propertyName</c>.</summary>
         <returns>animatedValue The value most recently calculated for the named property
-            by this &lt;code&gt;ValueAnimator&lt;/code&gt;.</returns>
+            by this <c>ValueAnimator</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1007,7 +1007,7 @@
       </ReturnValue>
       <MemberValue>1</MemberValue>
       <Docs>
-        <summary>When the animation reaches the end and &lt;code&gt;repeatCount&lt;/code&gt; is INFINITE
+        <summary>When the animation reaches the end and <c>repeatCount</c> is INFINITE
             or a positive value, the animation restarts from the beginning.</summary>
         <remarks>
           <para>
@@ -1243,7 +1243,7 @@
         <Parameter Name="value" Type="Android.Animation.ITimeInterpolator" />
       </Parameters>
       <Docs>
-        <param name="value">the interpolator to be used by this animation. A value of &lt;code&gt;null&lt;/code&gt;
+        <param name="value">the interpolator to be used by this animation. A value of <c>null</c>
             will result in linear interpolation.</param>
         <summary>The time interpolator used in calculating the elapsed fraction of this animation.</summary>
         <remarks>
diff --git a/docs/Mono.Android/en/Android.App.Admin/DeviceAdminInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.App.Admin/DeviceAdminInfo+InterfaceConsts.xml
index 667179a5c9..5d910c7251 100644
--- a/docs/Mono.Android/en/Android.App.Admin/DeviceAdminInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.App.Admin/DeviceAdminInfo+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.App.Admin/DevicePolicyManager.xml b/docs/Mono.Android/en/Android.App.Admin/DevicePolicyManager.xml
index 9e38b4a04a..9c75769d57 100644
--- a/docs/Mono.Android/en/Android.App.Admin/DevicePolicyManager.xml
+++ b/docs/Mono.Android/en/Android.App.Admin/DevicePolicyManager.xml
@@ -7117,8 +7117,7 @@
             <c>#KEYGUARD_DISABLE_TRUST_AGENTS</c>. If any admin declares
             <c>#KEYGUARD_DISABLE_TRUST_AGENTS</c> but doesn't call
             <c>#setTrustAgentConfiguration(ComponentName, ComponentName, PersistableBundle)</c>
-            for this {</param>
-        <param name="agent}}">or calls it with a null configuration, null is returned.</param>
+            for this <paramref>agent</paramref> or calls it with a null configuration, null is returned.</param>
         <param name="agent">Which component to get enabled features for.</param>
         <summary>Gets configuration for the given trust agent based on aggregating all calls to
             <c>#setTrustAgentConfiguration(ComponentName, ComponentName, PersistableBundle)</c> for
diff --git a/docs/Mono.Android/en/Android.App.Admin/FactoryResetProtectionPolicy+InterfaceConsts.xml b/docs/Mono.Android/en/Android.App.Admin/FactoryResetProtectionPolicy+InterfaceConsts.xml
index 059f0d19d7..7d13352b05 100644
--- a/docs/Mono.Android/en/Android.App.Admin/FactoryResetProtectionPolicy+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.App.Admin/FactoryResetProtectionPolicy+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.App.Admin/NetworkEvent+InterfaceConsts.xml b/docs/Mono.Android/en/Android.App.Admin/NetworkEvent+InterfaceConsts.xml
index f7800de6e6..bec0f4a22d 100644
--- a/docs/Mono.Android/en/Android.App.Admin/NetworkEvent+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.App.Admin/NetworkEvent+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.App.Admin/SecurityLog+SecurityEvent+InterfaceConsts.xml b/docs/Mono.Android/en/Android.App.Admin/SecurityLog+SecurityEvent+InterfaceConsts.xml
index 6dc65acd2a..459ad8698a 100644
--- a/docs/Mono.Android/en/Android.App.Admin/SecurityLog+SecurityEvent+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.App.Admin/SecurityLog+SecurityEvent+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.App.Admin/SystemUpdateInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.App.Admin/SystemUpdateInfo+InterfaceConsts.xml
index 6375e6b7c6..8bbbc2c80e 100644
--- a/docs/Mono.Android/en/Android.App.Admin/SystemUpdateInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.App.Admin/SystemUpdateInfo+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.App.Admin/SystemUpdatePolicy+InterfaceConsts.xml b/docs/Mono.Android/en/Android.App.Admin/SystemUpdatePolicy+InterfaceConsts.xml
index 02080d18e5..eab7361be7 100644
--- a/docs/Mono.Android/en/Android.App.Admin/SystemUpdatePolicy+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.App.Admin/SystemUpdatePolicy+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.App.Admin/SystemUpdatePolicy+ValidationFailedException+InterfaceConsts.xml b/docs/Mono.Android/en/Android.App.Admin/SystemUpdatePolicy+ValidationFailedException+InterfaceConsts.xml
index 07da257f96..4153e8282d 100644
--- a/docs/Mono.Android/en/Android.App.Admin/SystemUpdatePolicy+ValidationFailedException+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.App.Admin/SystemUpdatePolicy+ValidationFailedException+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.App.Admin/UnsafeStateException+InterfaceConsts.xml b/docs/Mono.Android/en/Android.App.Admin/UnsafeStateException+InterfaceConsts.xml
index 215e03650c..cbe497a9e7 100644
--- a/docs/Mono.Android/en/Android.App.Admin/UnsafeStateException+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.App.Admin/UnsafeStateException+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.App.Assist/AssistContent+InterfaceConsts.xml b/docs/Mono.Android/en/Android.App.Assist/AssistContent+InterfaceConsts.xml
index 78ab5a5453..b0edde946a 100644
--- a/docs/Mono.Android/en/Android.App.Assist/AssistContent+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.App.Assist/AssistContent+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.App.Assist/AssistStructure+InterfaceConsts.xml b/docs/Mono.Android/en/Android.App.Assist/AssistStructure+InterfaceConsts.xml
index e41cb450b3..413a234d7e 100644
--- a/docs/Mono.Android/en/Android.App.Assist/AssistStructure+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.App.Assist/AssistStructure+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.App.Backup/BackupAgent.xml b/docs/Mono.Android/en/Android.App.Backup/BackupAgent.xml
index 6dc8d6e645..b21eeb9851 100644
--- a/docs/Mono.Android/en/Android.App.Backup/BackupAgent.xml
+++ b/docs/Mono.Android/en/Android.App.Backup/BackupAgent.xml
@@ -293,7 +293,7 @@
       <Docs>
         <param name="oldState">An open, read-only ParcelFileDescriptor pointing to the
                        last backup state provided by the application. May be
-                       &lt;code&gt;null&lt;/code&gt;, in which case no prior state is being
+                       <c>null</c>, in which case no prior state is being
                        provided and the application should perform a full backup.</param>
         <param name="data">A structured wrapper around an open, read/write
                        file descriptor pointing to the backup data destination.
@@ -301,7 +301,7 @@
                        write to this file.</param>
         <param name="newState">An open, read/write ParcelFileDescriptor pointing to an
                        empty file. The application should record the final backup
-                       state here after writing the requested data to the &lt;code&gt;data&lt;/code&gt;
+                       state here after writing the requested data to the <c>data</c>
                        output stream.</param>
         <summary>The application is being asked to write any data changed since the last
             time it performed a backup operation.</summary>
@@ -526,8 +526,8 @@
                        operation.</param>
         <param name="newState">An open, read/write ParcelFileDescriptor pointing to an
                        empty file. The application should record the final backup
-                       state here after restoring its data from the &lt;code&gt;data&lt;/code&gt; stream.
-                       When a full-backup dataset is being restored, this will be &lt;code&gt;null&lt;/code&gt;.</param>
+                       state here after restoring its data from the <c>data</c> stream.
+                       When a full-backup dataset is being restored, this will be <c>null</c>.</param>
         <summary>The application is being restored from backup and should replace any
             existing data with the contents of the backup.</summary>
         <remarks>
diff --git a/docs/Mono.Android/en/Android.App.Backup/BackupDataInput.xml b/docs/Mono.Android/en/Android.App.Backup/BackupDataInput.xml
index 7161d66d8d..2d6ccb52d0 100644
--- a/docs/Mono.Android/en/Android.App.Backup/BackupDataInput.xml
+++ b/docs/Mono.Android/en/Android.App.Backup/BackupDataInput.xml
@@ -270,8 +270,9 @@
       <Parameters />
       <Docs>
         <summary>Extract the next entity header from the restore stream.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; when there is an entity ready for consumption from the
-               restore stream, &lt;code&gt;false&lt;/code&gt; if the restore stream has been fully consumed.</returns>
+        <returns>
+          <c>true</c> when there is an entity ready for consumption from the
+               restore stream, <c>false</c> if the restore stream has been fully consumed.</returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.App.Backup/FileBackupHelper.xml b/docs/Mono.Android/en/Android.App.Backup/FileBackupHelper.xml
index fc49cba4dd..d5bef52cda 100644
--- a/docs/Mono.Android/en/Android.App.Backup/FileBackupHelper.xml
+++ b/docs/Mono.Android/en/Android.App.Backup/FileBackupHelper.xml
@@ -193,9 +193,9 @@
             state here after writing the requested data to the <c>data</c>
             output stream.
 </param>
-        <summary>Based on &lt;code&gt;oldState&lt;/code&gt;, determine which of the files from the
+        <summary>Based on <c>oldState</c>, determine which of the files from the
             application's data directory need to be backed up, write them to the data
-            stream, and fill in &lt;code&gt;newState&lt;/code&gt; with the state as it exists
+            stream, and fill in <c>newState</c> with the state as it exists
             now.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.App.Backup/IBackupHelper.xml b/docs/Mono.Android/en/Android.App.Backup/IBackupHelper.xml
index 05655a6379..547adf51ce 100644
--- a/docs/Mono.Android/en/Android.App.Backup/IBackupHelper.xml
+++ b/docs/Mono.Android/en/Android.App.Backup/IBackupHelper.xml
@@ -69,7 +69,7 @@
       <Docs>
         <param name="oldState">An open, read-only <c>android.os.ParcelFileDescriptor</c> pointing to the
                        last backup state provided by the application. May be
-                       &lt;code&gt;null&lt;/code&gt;, in which case no prior state is being
+                       <c>null</c>, in which case no prior state is being
                        provided and the application should perform a full backup.</param>
         <param name="data">An open, read/write <c>BackupDataOutput</c>
                        pointing to the backup data destination.
@@ -77,11 +77,11 @@
                        write to this file.</param>
         <param name="newState">An open, read/write <c>android.os.ParcelFileDescriptor</c> pointing to an
                        empty file. The application should record the final backup
-                       state here after writing the requested data to the &lt;code&gt;data&lt;/code&gt;
+                       state here after writing the requested data to the <c>data</c>
                        output stream.</param>
-        <summary>Based on &lt;code&gt;oldState&lt;/code&gt;, determine what application content
-            needs to be backed up, write it to &lt;code&gt;data&lt;/code&gt;, and fill in
-            &lt;code&gt;newState&lt;/code&gt; with the complete state as it exists now.</summary>
+        <summary>Based on <c>oldState</c>, determine what application content
+            needs to be backed up, write it to <c>data</c>, and fill in
+            <c>newState</c> with the complete state as it exists now.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.App.Blob/BlobHandle+InterfaceConsts.xml b/docs/Mono.Android/en/Android.App.Blob/BlobHandle+InterfaceConsts.xml
index 0ef5a3c4bd..38f801dd01 100644
--- a/docs/Mono.Android/en/Android.App.Blob/BlobHandle+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.App.Blob/BlobHandle+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.App.Job/JobInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.App.Job/JobInfo+InterfaceConsts.xml
index d41c11c4c6..7b3a699b03 100644
--- a/docs/Mono.Android/en/Android.App.Job/JobInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.App.Job/JobInfo+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.App.Job/JobInfo+TriggerContentUri+InterfaceConsts.xml b/docs/Mono.Android/en/Android.App.Job/JobInfo+TriggerContentUri+InterfaceConsts.xml
index 8cac78d84f..8aaba6df3c 100644
--- a/docs/Mono.Android/en/Android.App.Job/JobInfo+TriggerContentUri+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.App.Job/JobInfo+TriggerContentUri+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.App.Job/JobParameters+InterfaceConsts.xml b/docs/Mono.Android/en/Android.App.Job/JobParameters+InterfaceConsts.xml
index d067896061..3eef3e8383 100644
--- a/docs/Mono.Android/en/Android.App.Job/JobParameters+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.App.Job/JobParameters+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.App.Job/JobWorkItem+InterfaceConsts.xml b/docs/Mono.Android/en/Android.App.Job/JobWorkItem+InterfaceConsts.xml
index db8be50a08..d1ac47cfec 100644
--- a/docs/Mono.Android/en/Android.App.Job/JobWorkItem+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.App.Job/JobWorkItem+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.App.People/ConversationStatus+InterfaceConsts.xml b/docs/Mono.Android/en/Android.App.People/ConversationStatus+InterfaceConsts.xml
index d898dc6a5b..f387faf89d 100644
--- a/docs/Mono.Android/en/Android.App.People/ConversationStatus+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.App.People/ConversationStatus+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.App.Slices/Slice+InterfaceConsts.xml b/docs/Mono.Android/en/Android.App.Slices/Slice+InterfaceConsts.xml
index a81c0c9341..4fe9c8af29 100644
--- a/docs/Mono.Android/en/Android.App.Slices/Slice+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.App.Slices/Slice+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.App.Slices/SliceItem+InterfaceConsts.xml b/docs/Mono.Android/en/Android.App.Slices/SliceItem+InterfaceConsts.xml
index 27bbe3d88a..583d4ed79f 100644
--- a/docs/Mono.Android/en/Android.App.Slices/SliceItem+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.App.Slices/SliceItem+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.App.Slices/SliceSpec+InterfaceConsts.xml b/docs/Mono.Android/en/Android.App.Slices/SliceSpec+InterfaceConsts.xml
index efbcd5799a..2f21844dd9 100644
--- a/docs/Mono.Android/en/Android.App.Slices/SliceSpec+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.App.Slices/SliceSpec+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.App.Usage/ConfigurationStats+InterfaceConsts.xml b/docs/Mono.Android/en/Android.App.Usage/ConfigurationStats+InterfaceConsts.xml
index 5c5b8fae40..5deb9f3f77 100644
--- a/docs/Mono.Android/en/Android.App.Usage/ConfigurationStats+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.App.Usage/ConfigurationStats+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.App.Usage/EventStats+InterfaceConsts.xml b/docs/Mono.Android/en/Android.App.Usage/EventStats+InterfaceConsts.xml
index d7c2d97447..e03865b28d 100644
--- a/docs/Mono.Android/en/Android.App.Usage/EventStats+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.App.Usage/EventStats+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.App.Usage/ExternalStorageStats+InterfaceConsts.xml b/docs/Mono.Android/en/Android.App.Usage/ExternalStorageStats+InterfaceConsts.xml
index 0bb5794ea2..52fabf3d49 100644
--- a/docs/Mono.Android/en/Android.App.Usage/ExternalStorageStats+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.App.Usage/ExternalStorageStats+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.App.Usage/StorageStats+InterfaceConsts.xml b/docs/Mono.Android/en/Android.App.Usage/StorageStats+InterfaceConsts.xml
index c2f488e4e4..1417e6c5ed 100644
--- a/docs/Mono.Android/en/Android.App.Usage/StorageStats+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.App.Usage/StorageStats+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.App.Usage/UsageEvents+InterfaceConsts.xml b/docs/Mono.Android/en/Android.App.Usage/UsageEvents+InterfaceConsts.xml
index c2531f4022..2a9edd6fb1 100644
--- a/docs/Mono.Android/en/Android.App.Usage/UsageEvents+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.App.Usage/UsageEvents+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.App.Usage/UsageStats+InterfaceConsts.xml b/docs/Mono.Android/en/Android.App.Usage/UsageStats+InterfaceConsts.xml
index 221ad3c2d2..e638f15122 100644
--- a/docs/Mono.Android/en/Android.App.Usage/UsageStats+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.App.Usage/UsageStats+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.App/Activity.xml b/docs/Mono.Android/en/Android.App/Activity.xml
index 7234678cf0..fee584c2e7 100644
--- a/docs/Mono.Android/en/Android.App/Activity.xml
+++ b/docs/Mono.Android/en/Android.App/Activity.xml
@@ -1104,16 +1104,6 @@
         <Parameter Name="params" Type="Android.App.PictureInPictureParams" />
       </Parameters>
       <Docs>
-        <param name="params}}">will be combined with the parameters from prior calls to
-            <c>#setPictureInPictureParams(PictureInPictureParams)</c>.
-            
-            The system may disallow entering picture-in-picture in various cases, including when the
-            activity is not visible, if the screen is locked or if the user has an activity pinned.
-            
-            &lt;p&gt;By default, system calculates the dimension of picture-in-picture window based on the
-            given {</param>
-        <param name="params}.}.">See <see href="https://developer.android.com/guide/topics/ui/picture-in-picture">Picture-in-picture Support</see>
-            on how to override this behavior.&lt;/p&gt;</param>
         <param name="params">non-null parameters to be combined with previously set parameters when entering
             picture-in-picture.</param>
         <summary>Puts the activity in picture-in-picture mode if possible in the current system state.</summary>
@@ -3398,7 +3388,7 @@
                 &lt;b&gt;<i>Note: Otherwise it is null.</i>&lt;/b&gt;</param>
         <summary>Same as <c>#onCreate(android.os.Bundle)</c> but called for those activities created with
             the attribute <c>android.R.attr#persistableMode</c> set to
-            &lt;code&gt;persistAcrossReboots&lt;/code&gt;.</summary>
+            <c>persistAcrossReboots</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -4166,7 +4156,7 @@
       <Docs>
         <param name="cancellationSignal">A signal to cancel the operation in progress.</param>
         <param name="callback">The callback to send the action list. The actions list cannot
-                contain &lt;code&gt;null&lt;/code&gt; elements. You can call this on any thread.</param>
+                contain <c>null</c> elements. You can call this on any thread.</param>
         <summary>Returns the list of direct actions supported by the app.</summary>
         <remarks>
           <para>
@@ -4220,8 +4210,8 @@
         <param name="e">Description of the key event.</param>
         <summary>Called when a key was pressed down and not handled by any of the views
             inside of the activity.</summary>
-        <returns>Return &lt;code&gt;true&lt;/code&gt; to prevent this event from being propagated
-            further, or &lt;code&gt;false&lt;/code&gt; to indicate that you have not handled
+        <returns>Return <c>true</c> to prevent this event from being propagated
+            further, or <c>false</c> to indicate that you have not handled
             this event and it should continue to be propagated.</returns>
         <remarks>
           <para>
@@ -4441,8 +4431,8 @@
         <param name="e">Description of the key event.</param>
         <summary>Called when a key was released and not handled by any of the views
             inside of the activity.</summary>
-        <returns>Return &lt;code&gt;true&lt;/code&gt; to prevent this event from being propagated
-            further, or &lt;code&gt;false&lt;/code&gt; to indicate that you have not handled
+        <returns>Return <c>true</c> to prevent this event from being propagated
+            further, or <c>false</c> to indicate that you have not handled
             this event and it should continue to be propagated.</returns>
         <remarks>
           <para>
@@ -4732,8 +4722,7 @@
       <Docs>
         <param name="isInMultiWindowMode">True if the activity is in multi-window mode.</param>
         <param name="newConfig">The new configuration of the activity with the state
-                             {</param>
-        <param name="isInMultiWindowMode}.}.">isInMultiWindowMode}.</param>
+                             <paramref>isInMultiWindowMode</paramref>.</param>
         <summary>Called by the system when the activity changes from fullscreen mode to multi-window mode and
             visa-versa.</summary>
         <remarks>
@@ -5172,8 +5161,7 @@
       <Docs>
         <param name="isInPictureInPictureMode">True if the activity is in picture-in-picture mode.</param>
         <param name="newConfig">The new configuration of the activity with the state
-                             {</param>
-        <param name="isInPictureInPictureMode}.}.">isInPictureInPictureMode}.</param>
+                             <paramref>isInPictureInPictureMode</paramref>.</param>
         <summary>Called by the system when the activity changes to and from picture-in-picture mode.</summary>
         <remarks>
           <para>
@@ -5343,7 +5331,7 @@
             saved in <c>#onSaveInstanceState(Bundle, PersistableBundle)</c>.</param>
         <summary>This is the same as <c>#onPostCreate(Bundle)</c> but is called for activities
             created with the attribute <c>android.R.attr#persistableMode</c> set to
-            &lt;code&gt;persistAcrossReboots&lt;/code&gt;.</summary>
+            <c>persistAcrossReboots</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -5961,7 +5949,7 @@
                 or null.</param>
         <summary>This is the same as <c>#onRestoreInstanceState(Bundle)</c> but is called for activities
             created with the attribute <c>android.R.attr#persistableMode</c> set to
-            &lt;code&gt;persistAcrossReboots&lt;/code&gt;.</summary>
+            <c>persistAcrossReboots</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -6138,7 +6126,7 @@
         <param name="outPersistentState">State which will be saved across reboots.</param>
         <summary>This is the same as <c>#onSaveInstanceState</c> but is called for activities
             created with the attribute <c>android.R.attr#persistableMode</c> set to
-            &lt;code&gt;persistAcrossReboots&lt;/code&gt;.</summary>
+            <c>persistAcrossReboots</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.App/ActivityManager+MemoryInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.App/ActivityManager+MemoryInfo+InterfaceConsts.xml
index 6326e181a3..5091a31afd 100644
--- a/docs/Mono.Android/en/Android.App/ActivityManager+MemoryInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.App/ActivityManager+MemoryInfo+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.App/ActivityManager+ProcessErrorStateInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.App/ActivityManager+ProcessErrorStateInfo+InterfaceConsts.xml
index dbb5076749..0710733665 100644
--- a/docs/Mono.Android/en/Android.App/ActivityManager+ProcessErrorStateInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.App/ActivityManager+ProcessErrorStateInfo+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.App/ActivityManager+RecentTaskInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.App/ActivityManager+RecentTaskInfo+InterfaceConsts.xml
index ceb91dcf00..5eb6ab9b6f 100644
--- a/docs/Mono.Android/en/Android.App/ActivityManager+RecentTaskInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.App/ActivityManager+RecentTaskInfo+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.App/ActivityManager+RunningAppProcessInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.App/ActivityManager+RunningAppProcessInfo+InterfaceConsts.xml
index 795960b605..6514c1195e 100644
--- a/docs/Mono.Android/en/Android.App/ActivityManager+RunningAppProcessInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.App/ActivityManager+RunningAppProcessInfo+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.App/ActivityManager+RunningServiceInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.App/ActivityManager+RunningServiceInfo+InterfaceConsts.xml
index 67e7dadefa..30435995b4 100644
--- a/docs/Mono.Android/en/Android.App/ActivityManager+RunningServiceInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.App/ActivityManager+RunningServiceInfo+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.App/ActivityManager+RunningTaskInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.App/ActivityManager+RunningTaskInfo+InterfaceConsts.xml
index 849e216d1e..9b45962ccf 100644
--- a/docs/Mono.Android/en/Android.App/ActivityManager+RunningTaskInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.App/ActivityManager+RunningTaskInfo+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.App/ActivityManager+TaskDescription+InterfaceConsts.xml b/docs/Mono.Android/en/Android.App/ActivityManager+TaskDescription+InterfaceConsts.xml
index 970932ec78..b4bde8bac9 100644
--- a/docs/Mono.Android/en/Android.App/ActivityManager+TaskDescription+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.App/ActivityManager+TaskDescription+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.App/AlarmManager+AlarmClockInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.App/AlarmManager+AlarmClockInfo+InterfaceConsts.xml
index 4bcc74e42d..b414b75de4 100644
--- a/docs/Mono.Android/en/Android.App/AlarmManager+AlarmClockInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.App/AlarmManager+AlarmClockInfo+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.App/ApplicationErrorReport+InterfaceConsts.xml b/docs/Mono.Android/en/Android.App/ApplicationErrorReport+InterfaceConsts.xml
index 3b0e02b4c0..7ce92bd656 100644
--- a/docs/Mono.Android/en/Android.App/ApplicationErrorReport+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.App/ApplicationErrorReport+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.App/ApplicationExitInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.App/ApplicationExitInfo+InterfaceConsts.xml
index 179c1c280b..9f294e1472 100644
--- a/docs/Mono.Android/en/Android.App/ApplicationExitInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.App/ApplicationExitInfo+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.App/ApplicationExitInfo.xml b/docs/Mono.Android/en/Android.App/ApplicationExitInfo.xml
index 1cbd017940..58d6af154f 100644
--- a/docs/Mono.Android/en/Android.App/ApplicationExitInfo.xml
+++ b/docs/Mono.Android/en/Android.App/ApplicationExitInfo.xml
@@ -94,7 +94,7 @@
         <summary>Return the defining kernel user identifier, maybe different from <c>#getRealUid</c> and
             <c>#getPackageUid</c>, if an external service has the
             <c>android.R.styleable#AndroidManifestService_useAppZygote android:useAppZygote</c> set
-            to &lt;code&gt;true&lt;/code&gt; and was bound with the flag
+            to <c>true</c> and was bound with the flag
             <c>android.content.Context#BIND_EXTERNAL_SERVICE</c> - in this case, this field here will
             be the kernel user identifier of the external service provider.</summary>
         <value>To be added.</value>
diff --git a/docs/Mono.Android/en/Android.App/AsyncNotedAppOp+InterfaceConsts.xml b/docs/Mono.Android/en/Android.App/AsyncNotedAppOp+InterfaceConsts.xml
index 50866d3d9c..e9ef99e5bb 100644
--- a/docs/Mono.Android/en/Android.App/AsyncNotedAppOp+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.App/AsyncNotedAppOp+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.App/AuthenticationRequiredException+InterfaceConsts.xml b/docs/Mono.Android/en/Android.App/AuthenticationRequiredException+InterfaceConsts.xml
index 03500ff22b..42e6ed31bc 100644
--- a/docs/Mono.Android/en/Android.App/AuthenticationRequiredException+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.App/AuthenticationRequiredException+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.App/AutomaticZenRule+InterfaceConsts.xml b/docs/Mono.Android/en/Android.App/AutomaticZenRule+InterfaceConsts.xml
index a5b772876f..5d0ecfafcf 100644
--- a/docs/Mono.Android/en/Android.App/AutomaticZenRule+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.App/AutomaticZenRule+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.App/BackgroundServiceStartNotAllowedException+InterfaceConsts.xml b/docs/Mono.Android/en/Android.App/BackgroundServiceStartNotAllowedException+InterfaceConsts.xml
index a9a4f2a2fc..128d7a0f22 100644
--- a/docs/Mono.Android/en/Android.App/BackgroundServiceStartNotAllowedException+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.App/BackgroundServiceStartNotAllowedException+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.App/DirectAction+InterfaceConsts.xml b/docs/Mono.Android/en/Android.App/DirectAction+InterfaceConsts.xml
index f9a4fcce3f..6707cba31c 100644
--- a/docs/Mono.Android/en/Android.App/DirectAction+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.App/DirectAction+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.App/ForegroundServiceStartNotAllowedException+InterfaceConsts.xml b/docs/Mono.Android/en/Android.App/ForegroundServiceStartNotAllowedException+InterfaceConsts.xml
index 3abc7d8393..43c537ea97 100644
--- a/docs/Mono.Android/en/Android.App/ForegroundServiceStartNotAllowedException+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.App/ForegroundServiceStartNotAllowedException+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.App/Fragment+SavedState+InterfaceConsts.xml b/docs/Mono.Android/en/Android.App/Fragment+SavedState+InterfaceConsts.xml
index 97624e9760..bb25ddda93 100644
--- a/docs/Mono.Android/en/Android.App/Fragment+SavedState+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.App/Fragment+SavedState+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.App/Fragment.xml b/docs/Mono.Android/en/Android.App/Fragment.xml
index 85fb46ff00..567d664e4b 100644
--- a/docs/Mono.Android/en/Android.App/Fragment.xml
+++ b/docs/Mono.Android/en/Android.App/Fragment.xml
@@ -2599,8 +2599,7 @@
       <Docs>
         <param name="isInMultiWindowMode">True if the activity is in multi-window mode.</param>
         <param name="newConfig">The new configuration of the activity with the state
-                             {</param>
-        <param name="isInMultiWindowMode}.}.">isInMultiWindowMode}.</param>
+                             <paramref>isInMultiWindowMode</paramref>.</param>
         <summary>Called when the Fragment's activity changes from fullscreen mode to multi-window mode and
             visa-versa.</summary>
         <remarks>
@@ -2824,8 +2823,7 @@
       <Docs>
         <param name="isInPictureInPictureMode">True if the activity is in picture-in-picture mode.</param>
         <param name="newConfig">The new configuration of the activity with the state
-                             {</param>
-        <param name="isInPictureInPictureMode}.}.">isInPictureInPictureMode}.</param>
+                             <paramref>isInPictureInPictureMode</paramref>.</param>
         <summary>Called by the system when the activity changes to and from picture-in-picture mode.</summary>
         <remarks>
           <para>
@@ -3514,7 +3512,7 @@
         <ReturnType>Android.Content.Res.Resources</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Return &lt;code&gt;getActivity().</summary>
+        <summary>Return <c>getActivity().getResources()</c>.</summary>
         <value>To be added.</value>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.App/Notification+Action+InterfaceConsts.xml b/docs/Mono.Android/en/Android.App/Notification+Action+InterfaceConsts.xml
index 7c3e51d78f..f62e23f7df 100644
--- a/docs/Mono.Android/en/Android.App/Notification+Action+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.App/Notification+Action+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.App/Notification+BubbleMetadata+InterfaceConsts.xml b/docs/Mono.Android/en/Android.App/Notification+BubbleMetadata+InterfaceConsts.xml
index 7bf2c1a7bb..82f8e8e537 100644
--- a/docs/Mono.Android/en/Android.App/Notification+BubbleMetadata+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.App/Notification+BubbleMetadata+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.App/Notification+InterfaceConsts.xml b/docs/Mono.Android/en/Android.App/Notification+InterfaceConsts.xml
index 2afaf51dd1..b97da06675 100644
--- a/docs/Mono.Android/en/Android.App/Notification+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.App/Notification+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.App/Notification.xml b/docs/Mono.Android/en/Android.App/Notification.xml
index cadf82c076..c376221eb0 100644
--- a/docs/Mono.Android/en/Android.App/Notification.xml
+++ b/docs/Mono.Android/en/Android.App/Notification.xml
@@ -558,7 +558,7 @@
         <ReturnType>System.String</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>One of the predefined notification categories (see the &lt;code&gt;CATEGORY_*&lt;/code&gt; constants)
+        <summary>One of the predefined notification categories (see the <c>CATEGORY_*</c> constants)
             that best describes this Notification.</summary>
         <value>To be added.</value>
         <remarks>
diff --git a/docs/Mono.Android/en/Android.App/NotificationChannel+InterfaceConsts.xml b/docs/Mono.Android/en/Android.App/NotificationChannel+InterfaceConsts.xml
index e103acf506..687458ff36 100644
--- a/docs/Mono.Android/en/Android.App/NotificationChannel+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.App/NotificationChannel+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.App/NotificationChannelGroup+InterfaceConsts.xml b/docs/Mono.Android/en/Android.App/NotificationChannelGroup+InterfaceConsts.xml
index 8a9c30c7a5..15c76d737e 100644
--- a/docs/Mono.Android/en/Android.App/NotificationChannelGroup+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.App/NotificationChannelGroup+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.App/NotificationManager+Policy+InterfaceConsts.xml b/docs/Mono.Android/en/Android.App/NotificationManager+Policy+InterfaceConsts.xml
index 978bc8cd66..d15fa5e8a8 100644
--- a/docs/Mono.Android/en/Android.App/NotificationManager+Policy+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.App/NotificationManager+Policy+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.App/PendingIntent+InterfaceConsts.xml b/docs/Mono.Android/en/Android.App/PendingIntent+InterfaceConsts.xml
index d81fc346f0..edc0c05338 100644
--- a/docs/Mono.Android/en/Android.App/PendingIntent+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.App/PendingIntent+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.App/Person+InterfaceConsts.xml b/docs/Mono.Android/en/Android.App/Person+InterfaceConsts.xml
index d5f86f4034..f96739d71a 100644
--- a/docs/Mono.Android/en/Android.App/Person+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.App/Person+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.App/PictureInPictureParams+InterfaceConsts.xml b/docs/Mono.Android/en/Android.App/PictureInPictureParams+InterfaceConsts.xml
index a2685be02a..b6e6c4d0a9 100644
--- a/docs/Mono.Android/en/Android.App/PictureInPictureParams+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.App/PictureInPictureParams+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.App/PictureInPictureUiState+InterfaceConsts.xml b/docs/Mono.Android/en/Android.App/PictureInPictureUiState+InterfaceConsts.xml
index f3c6c9e716..56cac426a8 100644
--- a/docs/Mono.Android/en/Android.App/PictureInPictureUiState+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.App/PictureInPictureUiState+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.App/RecoverableSecurityException+InterfaceConsts.xml b/docs/Mono.Android/en/Android.App/RecoverableSecurityException+InterfaceConsts.xml
index 98598513d9..a883bdfc51 100644
--- a/docs/Mono.Android/en/Android.App/RecoverableSecurityException+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.App/RecoverableSecurityException+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.App/RemoteAction+InterfaceConsts.xml b/docs/Mono.Android/en/Android.App/RemoteAction+InterfaceConsts.xml
index c2d40c354c..8d43da8f51 100644
--- a/docs/Mono.Android/en/Android.App/RemoteAction+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.App/RemoteAction+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.App/RemoteInput+InterfaceConsts.xml b/docs/Mono.Android/en/Android.App/RemoteInput+InterfaceConsts.xml
index f1a405500b..3e3ddfbffd 100644
--- a/docs/Mono.Android/en/Android.App/RemoteInput+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.App/RemoteInput+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.App/SearchManager.xml b/docs/Mono.Android/en/Android.App/SearchManager.xml
index c865c2f465..30d43230b9 100644
--- a/docs/Mono.Android/en/Android.App/SearchManager.xml
+++ b/docs/Mono.Android/en/Android.App/SearchManager.xml
@@ -490,7 +490,7 @@
       <Docs>
         <param name="componentName">The activity to get searchable information for.</param>
         <summary>Gets information about a searchable activity.</summary>
-        <returns>Searchable information, or &lt;code&gt;null&lt;/code&gt; if the activity does not
+        <returns>Searchable information, or <c>null</c> if the activity does not
                     exist, or is not searchable.</returns>
         <remarks>
           <para>
@@ -1027,7 +1027,7 @@
       <Docs>
         <summary>Returns a list of the searchable activities that can be included in global search.</summary>
         <value>a list containing searchable information for all searchable activities
-                    that have the &lt;code&gt;android:includeInGlobalSearch&lt;/code&gt; attribute set
+                    that have the <c>android:includeInGlobalSearch</c> attribute set
                     in their searchable meta-data.</value>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.App/SearchableInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.App/SearchableInfo+InterfaceConsts.xml
index e79a525b53..762b588d6b 100644
--- a/docs/Mono.Android/en/Android.App/SearchableInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.App/SearchableInfo+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.App/SyncNotedAppOp+InterfaceConsts.xml b/docs/Mono.Android/en/Android.App/SyncNotedAppOp+InterfaceConsts.xml
index e2326c2b1c..9b869927f9 100644
--- a/docs/Mono.Android/en/Android.App/SyncNotedAppOp+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.App/SyncNotedAppOp+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.App/UiAutomation.xml b/docs/Mono.Android/en/Android.App/UiAutomation.xml
index f55790381a..16f9edfa47 100644
--- a/docs/Mono.Android/en/Android.App/UiAutomation.xml
+++ b/docs/Mono.Android/en/Android.App/UiAutomation.xml
@@ -1453,7 +1453,7 @@
         <param name="globalTimeoutMillis">The maximal global timeout in milliseconds in
                        which to wait for an idle state.</param>
         <summary>Waits for the accessibility event stream to become idle, which is not to
-            have received an accessibility event within &lt;code&gt;idleTimeoutMillis&lt;/code&gt;.</summary>
+            have received an accessibility event within <c>idleTimeoutMillis</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.App/VoiceInteractor+PickOptionRequest+Option+InterfaceConsts.xml b/docs/Mono.Android/en/Android.App/VoiceInteractor+PickOptionRequest+Option+InterfaceConsts.xml
index 9ca170956d..c4288506f4 100644
--- a/docs/Mono.Android/en/Android.App/VoiceInteractor+PickOptionRequest+Option+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.App/VoiceInteractor+PickOptionRequest+Option+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.App/VoiceInteractor+Prompt+InterfaceConsts.xml b/docs/Mono.Android/en/Android.App/VoiceInteractor+Prompt+InterfaceConsts.xml
index 5ace9e3713..c29f7a1ce5 100644
--- a/docs/Mono.Android/en/Android.App/VoiceInteractor+Prompt+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.App/VoiceInteractor+Prompt+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.App/WallpaperColors+InterfaceConsts.xml b/docs/Mono.Android/en/Android.App/WallpaperColors+InterfaceConsts.xml
index e415d433a7..9e1a6d9582 100644
--- a/docs/Mono.Android/en/Android.App/WallpaperColors+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.App/WallpaperColors+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.App/WallpaperInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.App/WallpaperInfo+InterfaceConsts.xml
index 8f126321c6..254039d0e9 100644
--- a/docs/Mono.Android/en/Android.App/WallpaperInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.App/WallpaperInfo+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Appwidget/AppWidgetProviderInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Appwidget/AppWidgetProviderInfo+InterfaceConsts.xml
index aae4c6cb2e..ea173e68b2 100644
--- a/docs/Mono.Android/en/Android.Appwidget/AppWidgetProviderInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Appwidget/AppWidgetProviderInfo+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Bluetooth.LE/AdvertiseData+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Bluetooth.LE/AdvertiseData+InterfaceConsts.xml
index 991a557a94..7e5d562ace 100644
--- a/docs/Mono.Android/en/Android.Bluetooth.LE/AdvertiseData+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Bluetooth.LE/AdvertiseData+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Bluetooth.LE/AdvertiseSettings+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Bluetooth.LE/AdvertiseSettings+InterfaceConsts.xml
index 11b2347350..f2c545a6a2 100644
--- a/docs/Mono.Android/en/Android.Bluetooth.LE/AdvertiseSettings+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Bluetooth.LE/AdvertiseSettings+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Bluetooth.LE/AdvertisingSetParameters+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Bluetooth.LE/AdvertisingSetParameters+InterfaceConsts.xml
index 693c21244d..5c1a20c997 100644
--- a/docs/Mono.Android/en/Android.Bluetooth.LE/AdvertisingSetParameters+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Bluetooth.LE/AdvertisingSetParameters+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Bluetooth.LE/PeriodicAdvertisingParameters+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Bluetooth.LE/PeriodicAdvertisingParameters+InterfaceConsts.xml
index a26cee68de..bd0e319298 100644
--- a/docs/Mono.Android/en/Android.Bluetooth.LE/PeriodicAdvertisingParameters+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Bluetooth.LE/PeriodicAdvertisingParameters+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Bluetooth.LE/ScanFilter+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Bluetooth.LE/ScanFilter+InterfaceConsts.xml
index c7a5f06ea5..75b4b2a21b 100644
--- a/docs/Mono.Android/en/Android.Bluetooth.LE/ScanFilter+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Bluetooth.LE/ScanFilter+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Bluetooth.LE/ScanResult+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Bluetooth.LE/ScanResult+InterfaceConsts.xml
index 839c1e3446..4e246e8234 100644
--- a/docs/Mono.Android/en/Android.Bluetooth.LE/ScanResult+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Bluetooth.LE/ScanResult+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Bluetooth.LE/ScanSettings+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Bluetooth.LE/ScanSettings+InterfaceConsts.xml
index 342959b620..5717002739 100644
--- a/docs/Mono.Android/en/Android.Bluetooth.LE/ScanSettings+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Bluetooth.LE/ScanSettings+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Bluetooth/BluetoothClass+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Bluetooth/BluetoothClass+InterfaceConsts.xml
index 8f618aecf8..1f55286870 100644
--- a/docs/Mono.Android/en/Android.Bluetooth/BluetoothClass+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Bluetooth/BluetoothClass+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Bluetooth/BluetoothDevice+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Bluetooth/BluetoothDevice+InterfaceConsts.xml
index a640c0ac95..7f132b82b8 100644
--- a/docs/Mono.Android/en/Android.Bluetooth/BluetoothDevice+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Bluetooth/BluetoothDevice+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Bluetooth/BluetoothGattCharacteristic+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Bluetooth/BluetoothGattCharacteristic+InterfaceConsts.xml
index ba12973a8d..b6be58f465 100644
--- a/docs/Mono.Android/en/Android.Bluetooth/BluetoothGattCharacteristic+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Bluetooth/BluetoothGattCharacteristic+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Bluetooth/BluetoothGattDescriptor+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Bluetooth/BluetoothGattDescriptor+InterfaceConsts.xml
index 4f97fdc723..10ed0a3ee5 100644
--- a/docs/Mono.Android/en/Android.Bluetooth/BluetoothGattDescriptor+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Bluetooth/BluetoothGattDescriptor+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Bluetooth/BluetoothGattService+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Bluetooth/BluetoothGattService+InterfaceConsts.xml
index 19f3a4446c..a841cefecf 100644
--- a/docs/Mono.Android/en/Android.Bluetooth/BluetoothGattService+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Bluetooth/BluetoothGattService+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Bluetooth/BluetoothHealthAppConfiguration+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Bluetooth/BluetoothHealthAppConfiguration+InterfaceConsts.xml
index ef343b819b..545d287ee9 100644
--- a/docs/Mono.Android/en/Android.Bluetooth/BluetoothHealthAppConfiguration+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Bluetooth/BluetoothHealthAppConfiguration+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Bluetooth/BluetoothHidDevice+Callback.xml b/docs/Mono.Android/en/Android.Bluetooth/BluetoothHidDevice+Callback.xml
index a5729be066..90088085d7 100644
--- a/docs/Mono.Android/en/Android.Bluetooth/BluetoothHidDevice+Callback.xml
+++ b/docs/Mono.Android/en/Android.Bluetooth/BluetoothHidDevice+Callback.xml
@@ -132,8 +132,9 @@
         <param name="pluggedDevice">
           <c>BluetoothDevice</c> object which represents host that currently
                 has Virtual Cable established with device. Only valid when application is registered,
-                can be &lt;code&gt;null&lt;/code&gt;.</param>
-        <param name="registered">&lt;code&gt;true&lt;/code&gt; if application is registered, &lt;code&gt;false&lt;/code&gt;
+                can be <c>null</c>.</param>
+        <param name="registered">
+          <c>true</c> if application is registered, <c>false</c>
                 otherwise.</param>
         <summary>Callback called when application registration state changes.</summary>
         <remarks>
diff --git a/docs/Mono.Android/en/Android.Bluetooth/BluetoothHidDeviceAppQosSettings+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Bluetooth/BluetoothHidDeviceAppQosSettings+InterfaceConsts.xml
index 96fdf24415..8ec49710c8 100644
--- a/docs/Mono.Android/en/Android.Bluetooth/BluetoothHidDeviceAppQosSettings+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Bluetooth/BluetoothHidDeviceAppQosSettings+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Bluetooth/BluetoothHidDeviceAppSdpSettings+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Bluetooth/BluetoothHidDeviceAppSdpSettings+InterfaceConsts.xml
index d0b3e846a5..0e19449862 100644
--- a/docs/Mono.Android/en/Android.Bluetooth/BluetoothHidDeviceAppSdpSettings+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Bluetooth/BluetoothHidDeviceAppSdpSettings+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Companion/AssociationRequest+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Companion/AssociationRequest+InterfaceConsts.xml
index 0f9a421cdc..9a4dff5fc7 100644
--- a/docs/Mono.Android/en/Android.Companion/AssociationRequest+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Companion/AssociationRequest+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Content.PM.Verify.Domain/DomainVerificationUserState+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Content.PM.Verify.Domain/DomainVerificationUserState+InterfaceConsts.xml
index 28e989147b..32f440c85e 100644
--- a/docs/Mono.Android/en/Android.Content.PM.Verify.Domain/DomainVerificationUserState+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Content.PM.Verify.Domain/DomainVerificationUserState+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Content.PM/ActivityInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Content.PM/ActivityInfo+InterfaceConsts.xml
index 2a302037cf..69331feaaa 100644
--- a/docs/Mono.Android/en/Android.Content.PM/ActivityInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Content.PM/ActivityInfo+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Content.PM/ActivityInfo.xml b/docs/Mono.Android/en/Android.Content.PM/ActivityInfo.xml
index 093c175b91..600fcd1f6e 100644
--- a/docs/Mono.Android/en/Android.Content.PM/ActivityInfo.xml
+++ b/docs/Mono.Android/en/Android.Content.PM/ActivityInfo.xml
@@ -531,7 +531,7 @@
       </ReturnValue>
       <MemberValue>4</MemberValue>
       <Docs>
-        <summary>Constant corresponding to &lt;code&gt;singleInstancePerTask&lt;/code&gt; in
+        <summary>Constant corresponding to <c>singleInstancePerTask</c> in
             the <c>android.R.attr#launchMode</c> attribute.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Content.PM/ApkChecksum+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Content.PM/ApkChecksum+InterfaceConsts.xml
index 70ac3f2ba1..2d5ef3be18 100644
--- a/docs/Mono.Android/en/Android.Content.PM/ApkChecksum+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Content.PM/ApkChecksum+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Content.PM/ApplicationInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Content.PM/ApplicationInfo+InterfaceConsts.xml
index eb684120da..015cbdb5e3 100644
--- a/docs/Mono.Android/en/Android.Content.PM/ApplicationInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Content.PM/ApplicationInfo+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Content.PM/Attribution+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Content.PM/Attribution+InterfaceConsts.xml
index 1bf201d4d8..cf2a2e21e5 100644
--- a/docs/Mono.Android/en/Android.Content.PM/Attribution+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Content.PM/Attribution+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Content.PM/ChangedPackages+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Content.PM/ChangedPackages+InterfaceConsts.xml
index 110e7711fc..66127fc65f 100644
--- a/docs/Mono.Android/en/Android.Content.PM/ChangedPackages+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Content.PM/ChangedPackages+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Content.PM/Checksum+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Content.PM/Checksum+InterfaceConsts.xml
index 594afce2d9..02ed6b229f 100644
--- a/docs/Mono.Android/en/Android.Content.PM/Checksum+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Content.PM/Checksum+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Content.PM/ConfigurationInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Content.PM/ConfigurationInfo+InterfaceConsts.xml
index 0074165cf0..cc2acd356c 100644
--- a/docs/Mono.Android/en/Android.Content.PM/ConfigurationInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Content.PM/ConfigurationInfo+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Content.PM/FeatureGroupInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Content.PM/FeatureGroupInfo+InterfaceConsts.xml
index 9a705bac40..a38fc025b6 100644
--- a/docs/Mono.Android/en/Android.Content.PM/FeatureGroupInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Content.PM/FeatureGroupInfo+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Content.PM/FeatureInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Content.PM/FeatureInfo+InterfaceConsts.xml
index d855fe3b6c..a3e6eec9ae 100644
--- a/docs/Mono.Android/en/Android.Content.PM/FeatureInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Content.PM/FeatureInfo+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Content.PM/InstallSourceInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Content.PM/InstallSourceInfo+InterfaceConsts.xml
index e67f050d07..f8a366f6ab 100644
--- a/docs/Mono.Android/en/Android.Content.PM/InstallSourceInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Content.PM/InstallSourceInfo+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Content.PM/InstrumentationInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Content.PM/InstrumentationInfo+InterfaceConsts.xml
index f460706cd4..cffbc7c92b 100644
--- a/docs/Mono.Android/en/Android.Content.PM/InstrumentationInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Content.PM/InstrumentationInfo+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Content.PM/LauncherApps+PinItemRequest+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Content.PM/LauncherApps+PinItemRequest+InterfaceConsts.xml
index f74cfdf769..714f425eb9 100644
--- a/docs/Mono.Android/en/Android.Content.PM/LauncherApps+PinItemRequest+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Content.PM/LauncherApps+PinItemRequest+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Content.PM/ModuleInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Content.PM/ModuleInfo+InterfaceConsts.xml
index f827148cbf..1715dcb63e 100644
--- a/docs/Mono.Android/en/Android.Content.PM/ModuleInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Content.PM/ModuleInfo+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Content.PM/PackageInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Content.PM/PackageInfo+InterfaceConsts.xml
index 25a5e33b8f..73f16a55ac 100644
--- a/docs/Mono.Android/en/Android.Content.PM/PackageInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Content.PM/PackageInfo+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Content.PM/PackageInstaller+SessionInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Content.PM/PackageInstaller+SessionInfo+InterfaceConsts.xml
index 7b4ed1ba87..f2f46eeefa 100644
--- a/docs/Mono.Android/en/Android.Content.PM/PackageInstaller+SessionInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Content.PM/PackageInstaller+SessionInfo+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Content.PM/PackageInstaller+SessionParams+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Content.PM/PackageInstaller+SessionParams+InterfaceConsts.xml
index 110d9a5048..a66979e9c5 100644
--- a/docs/Mono.Android/en/Android.Content.PM/PackageInstaller+SessionParams+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Content.PM/PackageInstaller+SessionParams+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Content.PM/PackageManager+Property+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Content.PM/PackageManager+Property+InterfaceConsts.xml
index d9951d4456..b4116cd904 100644
--- a/docs/Mono.Android/en/Android.Content.PM/PackageManager+Property+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Content.PM/PackageManager+Property+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Content.PM/PackageManager.xml b/docs/Mono.Android/en/Android.Content.PM/PackageManager.xml
index 3c3de683de..428c92489c 100644
--- a/docs/Mono.Android/en/Android.Content.PM/PackageManager.xml
+++ b/docs/Mono.Android/en/Android.Content.PM/PackageManager.xml
@@ -7121,7 +7121,7 @@
         <param name="packageName">The name of the package to inspect.</param>
         <summary>Returns a "good" intent to launch a front-door activity in a package.</summary>
         <returns>A fully-qualified <c>Intent</c> that can be used to launch the
-            main activity in the package. Returns &lt;code&gt;null&lt;/code&gt; if the package
+            main activity in the package. Returns <c>null</c> if the package
             does not contain such an activity, or if &lt;em&gt;packageName&lt;/em&gt; is not
             recognized.</returns>
         <remarks>
diff --git a/docs/Mono.Android/en/Android.Content.PM/PackageStats+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Content.PM/PackageStats+InterfaceConsts.xml
index 0465859477..6f74d95f5e 100644
--- a/docs/Mono.Android/en/Android.Content.PM/PackageStats+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Content.PM/PackageStats+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Content.PM/PermissionGroupInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Content.PM/PermissionGroupInfo+InterfaceConsts.xml
index 88f0463e57..9a2bc7f0ec 100644
--- a/docs/Mono.Android/en/Android.Content.PM/PermissionGroupInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Content.PM/PermissionGroupInfo+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Content.PM/PermissionGroupInfo.xml b/docs/Mono.Android/en/Android.Content.PM/PermissionGroupInfo.xml
index f2ff8412c3..ce234d74b3 100644
--- a/docs/Mono.Android/en/Android.Content.PM/PermissionGroupInfo.xml
+++ b/docs/Mono.Android/en/Android.Content.PM/PermissionGroupInfo.xml
@@ -279,7 +279,7 @@
       </ReturnValue>
       <MemberValue>1</MemberValue>
       <Docs>
-        <summary>Flag for <c>#flags</c>, corresponding to &lt;code&gt;personalInfo&lt;/code&gt;
+        <summary>Flag for <c>#flags</c>, corresponding to <c>personalInfo</c>
             value of <c>android.R.attr#permissionGroupFlags</c>.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Content.PM/PermissionInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Content.PM/PermissionInfo+InterfaceConsts.xml
index 7572dc1cb7..05282a509f 100644
--- a/docs/Mono.Android/en/Android.Content.PM/PermissionInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Content.PM/PermissionInfo+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Content.PM/PermissionInfo.xml b/docs/Mono.Android/en/Android.Content.PM/PermissionInfo.xml
index cab4aa65ae..a147b3216c 100644
--- a/docs/Mono.Android/en/Android.Content.PM/PermissionInfo.xml
+++ b/docs/Mono.Android/en/Android.Content.PM/PermissionInfo.xml
@@ -279,7 +279,7 @@
       </ReturnValue>
       <MemberValue>1</MemberValue>
       <Docs>
-        <summary>Flag for <c>#flags</c>, corresponding to &lt;code&gt;costsMoney&lt;/code&gt;
+        <summary>Flag for <c>#flags</c>, corresponding to <c>costsMoney</c>
             value of <c>android.R.attr#permissionFlags</c>.</summary>
         <remarks>
           <para>
@@ -324,7 +324,7 @@
       </ReturnValue>
       <MemberValue>4</MemberValue>
       <Docs>
-        <summary>Flag for <c>#flags</c>, corresponding to &lt;code&gt;hardRestricted&lt;/code&gt;
+        <summary>Flag for <c>#flags</c>, corresponding to <c>hardRestricted</c>
             value of <c>android.R.attr#permissionFlags</c>.</summary>
         <remarks>
           <para>
@@ -368,7 +368,7 @@
       </ReturnValue>
       <MemberValue>16</MemberValue>
       <Docs>
-        <summary>Flag for <c>#flags</c>, corresponding to &lt;code&gt;immutablyRestricted&lt;/code&gt;
+        <summary>Flag for <c>#flags</c>, corresponding to <c>immutablyRestricted</c>
             value of <c>android.R.attr#permissionFlags</c>.</summary>
         <remarks>
           <para>
@@ -489,7 +489,7 @@
       </ReturnValue>
       <MemberValue>8</MemberValue>
       <Docs>
-        <summary>Flag for <c>#flags</c>, corresponding to &lt;code&gt;softRestricted&lt;/code&gt;
+        <summary>Flag for <c>#flags</c>, corresponding to <c>softRestricted</c>
             value of <c>android.R.attr#permissionFlags</c>.</summary>
         <remarks>
           <para>
@@ -794,7 +794,7 @@
       <MemberValue>4</MemberValue>
       <Docs>
         <summary>System-level value for <c>#protectionLevel</c>, corresponding
-            to the &lt;code&gt;internal&lt;/code&gt; value of
+            to the <c>internal</c> value of
             <c>android.R.attr#protectionLevel</c>.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Content.PM/ProviderInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Content.PM/ProviderInfo+InterfaceConsts.xml
index 7022f250f6..2a70c2ad37 100644
--- a/docs/Mono.Android/en/Android.Content.PM/ProviderInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Content.PM/ProviderInfo+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Content.PM/ResolveInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Content.PM/ResolveInfo+InterfaceConsts.xml
index 44d08f55b3..7aa7ff5019 100644
--- a/docs/Mono.Android/en/Android.Content.PM/ResolveInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Content.PM/ResolveInfo+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Content.PM/ServiceInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Content.PM/ServiceInfo+InterfaceConsts.xml
index e4acdd5943..536abfaeba 100644
--- a/docs/Mono.Android/en/Android.Content.PM/ServiceInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Content.PM/ServiceInfo+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Content.PM/ServiceInfo.xml b/docs/Mono.Android/en/Android.Content.PM/ServiceInfo.xml
index 3f4356b8e7..3a5771ddab 100644
--- a/docs/Mono.Android/en/Android.Content.PM/ServiceInfo.xml
+++ b/docs/Mono.Android/en/Android.Content.PM/ServiceInfo.xml
@@ -592,7 +592,7 @@
       </ReturnValue>
       <MemberValue>16</MemberValue>
       <Docs>
-        <summary>Constant corresponding to &lt;code&gt;connectedDevice&lt;/code&gt; in
+        <summary>Constant corresponding to <c>connectedDevice</c> in
             the <c>android.R.attr#foregroundServiceType</c> attribute.</summary>
         <remarks>
           <para>
@@ -636,7 +636,7 @@
       </ReturnValue>
       <MemberValue>1</MemberValue>
       <Docs>
-        <summary>Constant corresponding to &lt;code&gt;dataSync&lt;/code&gt; in
+        <summary>Constant corresponding to <c>dataSync</c> in
             the <c>android.R.attr#foregroundServiceType</c> attribute.</summary>
         <remarks>
           <para>
@@ -680,7 +680,7 @@
       </ReturnValue>
       <MemberValue>8</MemberValue>
       <Docs>
-        <summary>Constant corresponding to &lt;code&gt;location&lt;/code&gt; in
+        <summary>Constant corresponding to <c>location</c> in
             the <c>android.R.attr#foregroundServiceType</c> attribute.</summary>
         <remarks>
           <para>
@@ -767,7 +767,7 @@
       </ReturnValue>
       <MemberValue>2</MemberValue>
       <Docs>
-        <summary>Constant corresponding to &lt;code&gt;mediaPlayback&lt;/code&gt; in
+        <summary>Constant corresponding to <c>mediaPlayback</c> in
             the <c>android.R.attr#foregroundServiceType</c> attribute.</summary>
         <remarks>
           <para>
@@ -942,7 +942,7 @@
       </ReturnValue>
       <MemberValue>4</MemberValue>
       <Docs>
-        <summary>Constant corresponding to &lt;code&gt;phoneCall&lt;/code&gt; in
+        <summary>Constant corresponding to <c>phoneCall</c> in
             the <c>android.R.attr#foregroundServiceType</c> attribute.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Content.PM/SharedLibraryInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Content.PM/SharedLibraryInfo+InterfaceConsts.xml
index 44cf73b6cb..de603306d7 100644
--- a/docs/Mono.Android/en/Android.Content.PM/SharedLibraryInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Content.PM/SharedLibraryInfo+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Content.PM/ShortcutInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Content.PM/ShortcutInfo+InterfaceConsts.xml
index cff5a3dcfd..7c9358fa07 100644
--- a/docs/Mono.Android/en/Android.Content.PM/ShortcutInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Content.PM/ShortcutInfo+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Content.PM/ShortcutManager.xml b/docs/Mono.Android/en/Android.Content.PM/ShortcutManager.xml
index bed839f94e..a75bdf9f1a 100644
--- a/docs/Mono.Android/en/Android.Content.PM/ShortcutManager.xml
+++ b/docs/Mono.Android/en/Android.Content.PM/ShortcutManager.xml
@@ -18,7 +18,8 @@
     </Attribute>
   </Attributes>
   <Docs>
-    <summary>&lt;code&gt;ShortcutManager&lt;/code&gt; executes operations on an app's set of <i>shortcuts</i>, which
+    <summary>
+      <c>ShortcutManager</c> executes operations on an app's set of <i>shortcuts</i>, which
             represent specific tasks and actions that users can perform within your app.</summary>
     <remarks>
       <para>
@@ -129,7 +130,7 @@
         <summary>Returns an Intent which can be used by the default launcher to pin a shortcut containing the
             given <c>ShortcutInfo</c>.</summary>
         <returns>The intent that should be set as the result for the calling activity, or
-                &lt;code&gt;null&lt;/code&gt; if the current launcher doesn't support shortcuts.</returns>
+                <c>null</c> if the current launcher doesn't support shortcuts.</returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Content.PM/Signature+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Content.PM/Signature+InterfaceConsts.xml
index 27e7c12c1d..e730f8c67f 100644
--- a/docs/Mono.Android/en/Android.Content.PM/Signature+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Content.PM/Signature+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Content.PM/SigningInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Content.PM/SigningInfo+InterfaceConsts.xml
index e324679acc..2e756dd3ef 100644
--- a/docs/Mono.Android/en/Android.Content.PM/SigningInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Content.PM/SigningInfo+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Content.PM/VersionedPackage+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Content.PM/VersionedPackage+InterfaceConsts.xml
index 0bbc420bdf..aec0ff8948 100644
--- a/docs/Mono.Android/en/Android.Content.PM/VersionedPackage+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Content.PM/VersionedPackage+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Content.Res/AssetFileDescriptor+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Content.Res/AssetFileDescriptor+InterfaceConsts.xml
index 63e3825493..f8021b348a 100644
--- a/docs/Mono.Android/en/Android.Content.Res/AssetFileDescriptor+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Content.Res/AssetFileDescriptor+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Content.Res/AssetFileDescriptor.xml b/docs/Mono.Android/en/Android.Content.Res/AssetFileDescriptor.xml
index 236a2ba224..7a20b69e64 100644
--- a/docs/Mono.Android/en/Android.Content.Res/AssetFileDescriptor.xml
+++ b/docs/Mono.Android/en/Android.Content.Res/AssetFileDescriptor.xml
@@ -185,7 +185,7 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Convenience for calling &lt;code&gt;getParcelFileDescriptor().</summary>
+        <summary>Convenience for calling <c>getParcelFileDescriptor().close()</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Content.Res/ColorStateList+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Content.Res/ColorStateList+InterfaceConsts.xml
index 2328e80a4b..862c4d904a 100644
--- a/docs/Mono.Android/en/Android.Content.Res/ColorStateList+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Content.Res/ColorStateList+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Content.Res/Configuration+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Content.Res/Configuration+InterfaceConsts.xml
index 6b0063ede4..6009a48f61 100644
--- a/docs/Mono.Android/en/Android.Content.Res/Configuration+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Content.Res/Configuration+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Content.Res/ObbInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Content.Res/ObbInfo+InterfaceConsts.xml
index 7b6bd4e464..fb2948ccf8 100644
--- a/docs/Mono.Android/en/Android.Content.Res/ObbInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Content.Res/ObbInfo+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Content/AttributionSource+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Content/AttributionSource+InterfaceConsts.xml
index fa78f1e246..6b819a65c5 100644
--- a/docs/Mono.Android/en/Android.Content/AttributionSource+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Content/AttributionSource+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Content/ClipData+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Content/ClipData+InterfaceConsts.xml
index 52f5f1842f..3e66d6919a 100644
--- a/docs/Mono.Android/en/Android.Content/ClipData+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Content/ClipData+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Content/ClipDescription+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Content/ClipDescription+InterfaceConsts.xml
index e2a805623f..2de0b2f9bb 100644
--- a/docs/Mono.Android/en/Android.Content/ClipDescription+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Content/ClipDescription+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Content/ComponentName+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Content/ComponentName+InterfaceConsts.xml
index f61050b1da..9f571d4c23 100644
--- a/docs/Mono.Android/en/Android.Content/ComponentName+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Content/ComponentName+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Content/ContentProviderOperation+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Content/ContentProviderOperation+InterfaceConsts.xml
index 19a4363c1c..0599b9c898 100644
--- a/docs/Mono.Android/en/Android.Content/ContentProviderOperation+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Content/ContentProviderOperation+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Content/ContentProviderResult+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Content/ContentProviderResult+InterfaceConsts.xml
index eb671a0074..5fa0d97c85 100644
--- a/docs/Mono.Android/en/Android.Content/ContentProviderResult+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Content/ContentProviderResult+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Content/ContentResolver.xml b/docs/Mono.Android/en/Android.Content/ContentResolver.xml
index 0407ed8ca3..7e729fe548 100644
--- a/docs/Mono.Android/en/Android.Content/ContentResolver.xml
+++ b/docs/Mono.Android/en/Android.Content/ContentResolver.xml
@@ -1471,8 +1471,8 @@
         <param name="values">The initial values for the newly inserted row. The key is the column name for
                           the field. Passing an empty ContentValues will create an empty row.</param>
         <summary>Inserts a row into a table at the given URL.</summary>
-        <returns>the URL of the newly created row. May return &lt;code&gt;null&lt;/code&gt; if the underlying
-                    content provider returns &lt;code&gt;null&lt;/code&gt;, or if it crashes.</returns>
+        <returns>the URL of the newly created row. May return <c>null</c> if the underlying
+                    content provider returns <c>null</c>, or if it crashes.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1522,8 +1522,8 @@
                        the documentation for each individual provider will indicate
                        which arguments they support.</param>
         <summary>Inserts a row into a table at the given URL.</summary>
-        <returns>the URL of the newly created row. May return &lt;code&gt;null&lt;/code&gt; if the underlying
-                    content provider returns &lt;code&gt;null&lt;/code&gt;, or if it crashes.</returns>
+        <returns>the URL of the newly created row. May return <c>null</c> if the underlying
+                    content provider returns <c>null</c>, or if it crashes.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -2842,7 +2842,7 @@
         <summary>Query the given URI, returning a <c>Cursor</c> over the result set
             with support for cancellation.</summary>
         <returns>A Cursor object, which is positioned before the first entry. May return
-                    &lt;code&gt;null&lt;/code&gt; if the underlying content provider returns &lt;code&gt;null&lt;/code&gt;,
+                    <c>null</c> if the underlying content provider returns <c>null</c>,
                     or if it crashes.</returns>
         <remarks>
           <para>
@@ -2900,7 +2900,7 @@
                     default sort order, which may be unordered.</param>
         <summary>Query the given URI, returning a <c>Cursor</c> over the result set.</summary>
         <returns>A Cursor object, which is positioned before the first entry. May return
-                    &lt;code&gt;null&lt;/code&gt; if the underlying content provider returns &lt;code&gt;null&lt;/code&gt;,
+                    <c>null</c> if the underlying content provider returns <c>null</c>,
                     or if it crashes.</returns>
         <remarks>
           <para>
@@ -2965,7 +2965,7 @@
         <summary>Query the given URI, returning a <c>Cursor</c> over the result set
             with optional support for cancellation.</summary>
         <returns>A Cursor object, which is positioned before the first entry. May return
-                    &lt;code&gt;null&lt;/code&gt; if the underlying content provider returns &lt;code&gt;null&lt;/code&gt;,
+                    <c>null</c> if the underlying content provider returns <c>null</c>,
                     or if it crashes.</returns>
         <remarks>
           <para>
@@ -3593,7 +3593,7 @@
                        or a base URI for a whole class of content.</param>
         <param name="notifyForDescendants">When false, the observer will be notified
                        whenever a change occurs to the exact URI specified by
-                       &lt;code&gt;uri&lt;/code&gt; or to one of the URI's ancestors in the path
+                       <c>uri</c> or to one of the URI's ancestors in the path
                        hierarchy. When true, the observer will also be notified
                        whenever a change occurs to the URI's descendants in the path
                        hierarchy.</param>
diff --git a/docs/Mono.Android/en/Android.Content/ContentValues+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Content/ContentValues+InterfaceConsts.xml
index 2887836711..6f9fa070a0 100644
--- a/docs/Mono.Android/en/Android.Content/ContentValues+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Content/ContentValues+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Content/Context.xml b/docs/Mono.Android/en/Android.Content/Context.xml
index a6949bdd77..4a7da791e3 100644
--- a/docs/Mono.Android/en/Android.Content/Context.xml
+++ b/docs/Mono.Android/en/Android.Content/Context.xml
@@ -2144,7 +2144,7 @@
       </Parameters>
       <Docs>
         <param name="splitName">The name of the split to include, as declared in the split's
-                             &lt;code&gt;AndroidManifest.xml&lt;/code&gt;.</param>
+                             <c>AndroidManifest.xml</c>.</param>
         <summary>Return a new Context object for the given split name.</summary>
         <returns>A <c>Context</c> with the given split's code and/or resources loaded.</returns>
         <remarks>
diff --git a/docs/Mono.Android/en/Android.Content/Intent+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Content/Intent+InterfaceConsts.xml
index 5f106b98e0..0b0f941c96 100644
--- a/docs/Mono.Android/en/Android.Content/Intent+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Content/Intent+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Content/Intent+ShortcutIconResource+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Content/Intent+ShortcutIconResource+InterfaceConsts.xml
index 7e6c2af834..49e0ecfcd0 100644
--- a/docs/Mono.Android/en/Android.Content/Intent+ShortcutIconResource+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Content/Intent+ShortcutIconResource+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Content/Intent.xml b/docs/Mono.Android/en/Android.Content/Intent.xml
index 0bbeb538a5..99a3cd98c9 100644
--- a/docs/Mono.Android/en/Android.Content/Intent.xml
+++ b/docs/Mono.Android/en/Android.Content/Intent.xml
@@ -15478,7 +15478,7 @@
         <param name="packageContext">A Context of the application package implementing
             this class.</param>
         <param name="cls">The class name to set, equivalent to
-                       &lt;code&gt;setClassName(context, cls.getName())&lt;/code&gt;.</param>
+                       <c>setClassName(context, cls.getName())</c>.</param>
         <summary>Convenience for calling <c>#setComponent(ComponentName)</c> with the
             name returned by a <c>Class</c> object.</summary>
         <returns>Returns the same Intent object, for chaining multiple calls
diff --git a/docs/Mono.Android/en/Android.Content/IntentFilter+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Content/IntentFilter+InterfaceConsts.xml
index 8b0a8533a9..2101f48c72 100644
--- a/docs/Mono.Android/en/Android.Content/IntentFilter+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Content/IntentFilter+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Content/IntentSender+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Content/IntentSender+InterfaceConsts.xml
index 8eeb244847..dd451ba343 100644
--- a/docs/Mono.Android/en/Android.Content/IntentSender+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Content/IntentSender+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Content/LocusId+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Content/LocusId+InterfaceConsts.xml
index ccb5ab4e4a..2dec10bcd9 100644
--- a/docs/Mono.Android/en/Android.Content/LocusId+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Content/LocusId+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Content/PeriodicSync+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Content/PeriodicSync+InterfaceConsts.xml
index c303023128..f357c77c75 100644
--- a/docs/Mono.Android/en/Android.Content/PeriodicSync+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Content/PeriodicSync+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Content/RestrictionEntry+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Content/RestrictionEntry+InterfaceConsts.xml
index 5973e39eb0..7f7f0a4416 100644
--- a/docs/Mono.Android/en/Android.Content/RestrictionEntry+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Content/RestrictionEntry+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Content/SyncAdapterType+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Content/SyncAdapterType+InterfaceConsts.xml
index 3725c2d057..eda053f4dc 100644
--- a/docs/Mono.Android/en/Android.Content/SyncAdapterType+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Content/SyncAdapterType+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Content/SyncInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Content/SyncInfo+InterfaceConsts.xml
index 9a95d4290a..97dd54252b 100644
--- a/docs/Mono.Android/en/Android.Content/SyncInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Content/SyncInfo+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Content/SyncRequest+Builder.xml b/docs/Mono.Android/en/Android.Content/SyncRequest+Builder.xml
index 84ff2c003d..a5fea99f88 100644
--- a/docs/Mono.Android/en/Android.Content/SyncRequest+Builder.xml
+++ b/docs/Mono.Android/en/Android.Content/SyncRequest+Builder.xml
@@ -101,7 +101,7 @@
       <Parameters />
       <Docs>
         <summary>Performs validation over the request and throws the runtime exception
-            &lt;code&gt;IllegalArgumentException&lt;/code&gt; if this validation fails.</summary>
+            <c>IllegalArgumentException</c> if this validation fails.</summary>
         <returns>a SyncRequest with the information contained within this
                     builder.</returns>
         <remarks>
diff --git a/docs/Mono.Android/en/Android.Content/SyncRequest+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Content/SyncRequest+InterfaceConsts.xml
index 984d225633..898491f348 100644
--- a/docs/Mono.Android/en/Android.Content/SyncRequest+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Content/SyncRequest+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Content/SyncResult+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Content/SyncResult+InterfaceConsts.xml
index 9394fcb681..03667beb26 100644
--- a/docs/Mono.Android/en/Android.Content/SyncResult+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Content/SyncResult+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Content/SyncStats+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Content/SyncStats+InterfaceConsts.xml
index da5af685fc..d7cd1e8100 100644
--- a/docs/Mono.Android/en/Android.Content/SyncStats+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Content/SyncStats+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Content/UriPermission+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Content/UriPermission+InterfaceConsts.xml
index cb8edef46e..f4984dc801 100644
--- a/docs/Mono.Android/en/Android.Content/UriPermission+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Content/UriPermission+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Database.Sqlite/SQLiteDatabase.xml b/docs/Mono.Android/en/Android.Database.Sqlite/SQLiteDatabase.xml
index 0c5f3db006..5d30f80065 100644
--- a/docs/Mono.Android/en/Android.Database.Sqlite/SQLiteDatabase.xml
+++ b/docs/Mono.Android/en/Android.Database.Sqlite/SQLiteDatabase.xml
@@ -1033,13 +1033,13 @@
       </Parameters>
       <Docs>
         <param name="table">the table to insert the row into</param>
-        <param name="nullColumnHack">optional; may be &lt;code&gt;null&lt;/code&gt;.
+        <param name="nullColumnHack">optional; may be <c>null</c>.
                        SQL doesn't allow inserting a completely empty row without
-                       naming at least one column name.  If your provided &lt;code&gt;values&lt;/code&gt; is
+                       naming at least one column name.  If your provided <c>values</c> is
                        empty, no column names are known and an empty row can't be inserted.
-                       If not set to null, the &lt;code&gt;nullColumnHack&lt;/code&gt; parameter
+                       If not set to null, the <c>nullColumnHack</c> parameter
                        provides the name of nullable column name to explicitly insert a NULL into
-                       in the case where your &lt;code&gt;values&lt;/code&gt; is empty.</param>
+                       in the case where your <c>values</c> is empty.</param>
         <param name="values">this map contains the initial column values for the
                        row. The keys should be the column names and the values the
                        column values</param>
@@ -1086,13 +1086,13 @@
       </Parameters>
       <Docs>
         <param name="table">the table to insert the row into</param>
-        <param name="nullColumnHack">optional; may be &lt;code&gt;null&lt;/code&gt;.
+        <param name="nullColumnHack">optional; may be <c>null</c>.
                        SQL doesn't allow inserting a completely empty row without
-                       naming at least one column name.  If your provided &lt;code&gt;values&lt;/code&gt; is
+                       naming at least one column name.  If your provided <c>values</c> is
                        empty, no column names are known and an empty row can't be inserted.
-                       If not set to null, the &lt;code&gt;nullColumnHack&lt;/code&gt; parameter
+                       If not set to null, the <c>nullColumnHack</c> parameter
                        provides the name of nullable column name to explicitly insert a NULL into
-                       in the case where your &lt;code&gt;values&lt;/code&gt; is empty.</param>
+                       in the case where your <c>values</c> is empty.</param>
         <param name="values">this map contains the initial column values for the
                        row. The keys should be the column names and the values the
                        column values</param>
@@ -1149,20 +1149,20 @@
       </Parameters>
       <Docs>
         <param name="table">the table to insert the row into</param>
-        <param name="nullColumnHack">optional; may be &lt;code&gt;null&lt;/code&gt;.
+        <param name="nullColumnHack">optional; may be <c>null</c>.
                        SQL doesn't allow inserting a completely empty row without
-                       naming at least one column name.  If your provided &lt;code&gt;initialValues&lt;/code&gt; is
+                       naming at least one column name.  If your provided <c>initialValues</c> is
                        empty, no column names are known and an empty row can't be inserted.
-                       If not set to null, the &lt;code&gt;nullColumnHack&lt;/code&gt; parameter
+                       If not set to null, the <c>nullColumnHack</c> parameter
                        provides the name of nullable column name to explicitly insert a NULL into
-                       in the case where your &lt;code&gt;initialValues&lt;/code&gt; is empty.</param>
+                       in the case where your <c>initialValues</c> is empty.</param>
         <param name="initialValues">this map contains the initial column values for the
                        row. The keys should be the column names and the values the
                        column values</param>
         <param name="conflictAlgorithm">for insert conflict resolver</param>
         <summary>General method for inserting a row into the database.</summary>
-        <returns>the row ID of the newly inserted row OR &lt;code&gt;-1&lt;/code&gt; if either the
-                       input parameter &lt;code&gt;conflictAlgorithm&lt;/code&gt; = <c>#CONFLICT_IGNORE</c>
+        <returns>the row ID of the newly inserted row OR <c>-1</c> if either the
+                       input parameter <c>conflictAlgorithm</c> = <c>#CONFLICT_IGNORE</c>
                        or an error occurred.</returns>
         <remarks>
           <para>
@@ -2811,13 +2811,13 @@
       </Parameters>
       <Docs>
         <param name="table">the table in which to replace the row</param>
-        <param name="nullColumnHack">optional; may be &lt;code&gt;null&lt;/code&gt;.
+        <param name="nullColumnHack">optional; may be <c>null</c>.
                        SQL doesn't allow inserting a completely empty row without
-                       naming at least one column name.  If your provided &lt;code&gt;initialValues&lt;/code&gt; is
+                       naming at least one column name.  If your provided <c>initialValues</c> is
                        empty, no column names are known and an empty row can't be inserted.
-                       If not set to null, the &lt;code&gt;nullColumnHack&lt;/code&gt; parameter
+                       If not set to null, the <c>nullColumnHack</c> parameter
                        provides the name of nullable column name to explicitly insert a NULL into
-                       in the case where your &lt;code&gt;initialValues&lt;/code&gt; is empty.</param>
+                       in the case where your <c>initialValues</c> is empty.</param>
         <param name="initialValues">this map contains the initial column values for
               the row. The keys should be the column names and the values the column values.</param>
         <summary>Convenience method for replacing a row in the database.</summary>
@@ -2863,13 +2863,13 @@
       </Parameters>
       <Docs>
         <param name="table">the table in which to replace the row</param>
-        <param name="nullColumnHack">optional; may be &lt;code&gt;null&lt;/code&gt;.
+        <param name="nullColumnHack">optional; may be <c>null</c>.
                        SQL doesn't allow inserting a completely empty row without
-                       naming at least one column name.  If your provided &lt;code&gt;initialValues&lt;/code&gt; is
+                       naming at least one column name.  If your provided <c>initialValues</c> is
                        empty, no column names are known and an empty row can't be inserted.
-                       If not set to null, the &lt;code&gt;nullColumnHack&lt;/code&gt; parameter
+                       If not set to null, the <c>nullColumnHack</c> parameter
                        provides the name of nullable column name to explicitly insert a NULL into
-                       in the case where your &lt;code&gt;initialValues&lt;/code&gt; is empty.</param>
+                       in the case where your <c>initialValues</c> is empty.</param>
         <param name="initialValues">this map contains the initial column values for
               the row. The keys should be the column names and the values the column values.</param>
         <summary>Convenience method for replacing a row in the database.</summary>
diff --git a/docs/Mono.Android/en/Android.Database/CursorWindow+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Database/CursorWindow+InterfaceConsts.xml
index 2e26072941..a84b8e8703 100644
--- a/docs/Mono.Android/en/Android.Database/CursorWindow+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Database/CursorWindow+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Database/CursorWindow.xml b/docs/Mono.Android/en/Android.Database/CursorWindow.xml
index 0e8da95cb2..f48c95fc60 100644
--- a/docs/Mono.Android/en/Android.Database/CursorWindow.xml
+++ b/docs/Mono.Android/en/Android.Database/CursorWindow.xml
@@ -508,8 +508,8 @@
         <param name="row">The zero-based row index.</param>
         <param name="column">The zero-based column index.</param>
         <summary>Gets the value of the field at the specified row and column index as a
-            &lt;code&gt;double&lt;/code&gt;.</summary>
-        <returns>The value of the field as a &lt;code&gt;double&lt;/code&gt;.</returns>
+            <c>double</c>.</summary>
+        <returns>The value of the field as a <c>double</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -552,8 +552,8 @@
         <param name="row">The zero-based row index.</param>
         <param name="column">The zero-based column index.</param>
         <summary>Gets the value of the field at the specified row and column index as a
-            &lt;code&gt;float&lt;/code&gt;.</summary>
-        <returns>The value of the field as an &lt;code&gt;float&lt;/code&gt;.</returns>
+            <c>float</c>.</summary>
+        <returns>The value of the field as an <c>float</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -596,8 +596,8 @@
         <param name="row">The zero-based row index.</param>
         <param name="column">The zero-based column index.</param>
         <summary>Gets the value of the field at the specified row and column index as an
-            &lt;code&gt;int&lt;/code&gt;.</summary>
-        <returns>The value of the field as an &lt;code&gt;int&lt;/code&gt;.</returns>
+            <c>int</c>.</summary>
+        <returns>The value of the field as an <c>int</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -639,8 +639,8 @@
       <Docs>
         <param name="row">The zero-based row index.</param>
         <param name="column">The zero-based column index.</param>
-        <summary>Gets the value of the field at the specified row and column index as a &lt;code&gt;long&lt;/code&gt;.</summary>
-        <returns>The value of the field as a &lt;code&gt;long&lt;/code&gt;.</returns>
+        <summary>Gets the value of the field at the specified row and column index as a <c>long</c>.</summary>
+        <returns>The value of the field as a <c>long</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -683,8 +683,8 @@
         <param name="row">The zero-based row index.</param>
         <param name="column">The zero-based column index.</param>
         <summary>Gets the value of the field at the specified row and column index as a
-            &lt;code&gt;short&lt;/code&gt;.</summary>
-        <returns>The value of the field as a &lt;code&gt;short&lt;/code&gt;.</returns>
+            <c>short</c>.</summary>
+        <returns>The value of the field as a <c>short</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Database/ICursor.xml b/docs/Mono.Android/en/Android.Database/ICursor.xml
index 13e2e4b9a1..4f2e6ac44a 100644
--- a/docs/Mono.Android/en/Android.Database/ICursor.xml
+++ b/docs/Mono.Android/en/Android.Database/ICursor.xml
@@ -925,7 +925,7 @@
       </Parameters>
       <Docs>
         <param name="columnIndex">the zero-based index of the target column.</param>
-        <summary>Returns &lt;code&gt;true&lt;/code&gt; if the value in the indicated column is null.</summary>
+        <summary>Returns <c>true</c> if the value in the indicated column is null.</summary>
         <returns>whether the column value is null.</returns>
         <remarks>
           <para>
@@ -1385,10 +1385,10 @@
       </Parameters>
       <Docs>
         <param name="extras">extra values, or <c>android.os.Bundle#EMPTY Bundle.EMPTY</c>.
-                    Never &lt;code&gt;null&lt;/code&gt;.</param>
+                    Never <c>null</c>.</param>
         <summary>This is an out-of-band way for the the user of a cursor to communicate with the cursor.</summary>
         <returns>extra values, or <c>android.os.Bundle#EMPTY Bundle.EMPTY</c>.
-                    Never &lt;code&gt;null&lt;/code&gt;.</returns>
+                    Never <c>null</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Drm/DrmConvertedStatus.xml b/docs/Mono.Android/en/Android.Drm/DrmConvertedStatus.xml
index 2d1ce7d479..dac4f788ba 100644
--- a/docs/Mono.Android/en/Android.Drm/DrmConvertedStatus.xml
+++ b/docs/Mono.Android/en/Android.Drm/DrmConvertedStatus.xml
@@ -99,7 +99,7 @@
             defined above.</param>
         <param name="convertedData">Converted data. It can be null.</param>
         <param name="offset">Offset value for appending the header and body signature.</param>
-        <summary>Creates a &lt;code&gt;DrmConvertedStatus&lt;/code&gt; object with the specified parameters.</summary>
+        <summary>Creates a <c>DrmConvertedStatus</c> object with the specified parameters.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Drm/DrmErrorEvent.xml b/docs/Mono.Android/en/Android.Drm/DrmErrorEvent.xml
index a87d9ef3f2..18bf6f5095 100644
--- a/docs/Mono.Android/en/Android.Drm/DrmErrorEvent.xml
+++ b/docs/Mono.Android/en/Android.Drm/DrmErrorEvent.xml
@@ -98,7 +98,7 @@
         <param name="uniqueId">Unique session identifier.</param>
         <param name="type">Type of the event. Must be any of the event types defined above.</param>
         <param name="message">Message description. It can be null.</param>
-        <summary>Creates a &lt;code&gt;DrmErrorEvent&lt;/code&gt; object with the specified parameters.</summary>
+        <summary>Creates a <c>DrmErrorEvent</c> object with the specified parameters.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -153,7 +153,7 @@
         <param name="message">Message description.</param>
         <param name="attributes">Attributes for extensible information. Could be any
             information provided by the plug-in. It can be null.</param>
-        <summary>Creates a &lt;code&gt;DrmErrorEvent&lt;/code&gt; object with the specified parameters.</summary>
+        <summary>Creates a <c>DrmErrorEvent</c> object with the specified parameters.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Drm/DrmEvent.xml b/docs/Mono.Android/en/Android.Drm/DrmEvent.xml
index aa2665fec9..8859dfb02f 100644
--- a/docs/Mono.Android/en/Android.Drm/DrmEvent.xml
+++ b/docs/Mono.Android/en/Android.Drm/DrmEvent.xml
@@ -90,7 +90,7 @@
         <param name="uniqueId">Unique session identifier.</param>
         <param name="type">Type of information.</param>
         <param name="message">Message description.</param>
-        <summary>Creates a &lt;code&gt;DrmEvent&lt;/code&gt; object with the specified parameters.</summary>
+        <summary>Creates a <c>DrmEvent</c> object with the specified parameters.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -137,7 +137,7 @@
         <param name="type">Type of information.</param>
         <param name="message">Message description.</param>
         <param name="attributes">Attributes for extensible information.</param>
-        <summary>Creates a &lt;code&gt;DrmEvent&lt;/code&gt; object with the specified parameters.</summary>
+        <summary>Creates a <c>DrmEvent</c> object with the specified parameters.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -176,7 +176,7 @@
         <ReturnType>System.String</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>The key that is used in the &lt;code&gt;attributes&lt;/code&gt; HashMap to pass the
+        <summary>The key that is used in the <c>attributes</c> HashMap to pass the
             <c>DrmInfo</c> object.</summary>
         <remarks>
           <para>
@@ -217,7 +217,7 @@
         <ReturnType>System.String</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>The key that is used in the &lt;code&gt;attributes&lt;/code&gt; HashMap to pass the return status.</summary>
+        <summary>The key that is used in the <c>attributes</c> HashMap to pass the return status.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Drm/DrmInfo.xml b/docs/Mono.Android/en/Android.Drm/DrmInfo.xml
index 568dda1061..2f39ead195 100644
--- a/docs/Mono.Android/en/Android.Drm/DrmInfo.xml
+++ b/docs/Mono.Android/en/Android.Drm/DrmInfo.xml
@@ -98,7 +98,7 @@
         <param name="infoType">The type of information.</param>
         <param name="data">The trigger data.</param>
         <param name="mimeType">The MIME type.</param>
-        <summary>Creates a &lt;code&gt;DrmInfo&lt;/code&gt; object with the given parameters.</summary>
+        <summary>Creates a <c>DrmInfo</c> object with the given parameters.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -150,7 +150,7 @@
         <param name="infoType">The type of information.</param>
         <param name="path">The trigger data.</param>
         <param name="mimeType">The MIME type.</param>
-        <summary>Creates a &lt;code&gt;DrmInfo&lt;/code&gt; object with the given parameters.</summary>
+        <summary>Creates a <c>DrmInfo</c> object with the given parameters.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -320,7 +320,7 @@
       <Parameters />
       <Docs>
         <summary>Retrieves an iterator object that you can use to iterate over the values associated with
-            this &lt;code&gt;DrmInfo&lt;/code&gt; object.</summary>
+            this <c>DrmInfo</c> object.</summary>
         <returns>The iterator object.</returns>
         <remarks>
           <para>
@@ -394,7 +394,7 @@
       <Parameters />
       <Docs>
         <summary>Retrieves an iterator object that you can use to iterate over the keys associated with
-            this &lt;code&gt;DrmInfo&lt;/code&gt; object.</summary>
+            this <c>DrmInfo</c> object.</summary>
         <returns>The iterator object.</returns>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Drm/DrmInfoEvent.xml b/docs/Mono.Android/en/Android.Drm/DrmInfoEvent.xml
index 621830c63f..fe776ebd44 100644
--- a/docs/Mono.Android/en/Android.Drm/DrmInfoEvent.xml
+++ b/docs/Mono.Android/en/Android.Drm/DrmInfoEvent.xml
@@ -99,7 +99,7 @@
         <param name="type">Type of the event. Must be any of the event types defined above,
             or the constants defined in <c>DrmEvent</c>.</param>
         <param name="message">Message description. It can be null.</param>
-        <summary>Creates a &lt;code&gt;DrmInfoEvent&lt;/code&gt; object with the specified parameters.</summary>
+        <summary>Creates a <c>DrmInfoEvent</c> object with the specified parameters.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -155,7 +155,7 @@
         <param name="message">Message description. It can be null.</param>
         <param name="attributes">Attributes for extensible information. Could be any
             information provided by the plug-in.</param>
-        <summary>Creates a &lt;code&gt;DrmInfoEvent&lt;/code&gt; object with the specified parameters.</summary>
+        <summary>Creates a <c>DrmInfoEvent</c> object with the specified parameters.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Drm/DrmInfoRequest.xml b/docs/Mono.Android/en/Android.Drm/DrmInfoRequest.xml
index 045fc874ff..ee6e55bffa 100644
--- a/docs/Mono.Android/en/Android.Drm/DrmInfoRequest.xml
+++ b/docs/Mono.Android/en/Android.Drm/DrmInfoRequest.xml
@@ -72,7 +72,7 @@
       <Docs>
         <param name="infoType">Type of information.</param>
         <param name="mimeType">MIME type.</param>
-        <summary>Creates a &lt;code&gt;DrmInfoRequest&lt;/code&gt; object with type and MIME type.</summary>
+        <summary>Creates a <c>DrmInfoRequest</c> object with type and MIME type.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -264,7 +264,7 @@
       <Parameters />
       <Docs>
         <summary>Retrieves an iterator object that you can use to iterate over the values associated with
-            this &lt;code&gt;DrmInfoRequest&lt;/code&gt; object.</summary>
+            this <c>DrmInfoRequest</c> object.</summary>
         <returns>The iterator object.</returns>
         <remarks>
           <para>
@@ -338,7 +338,7 @@
       <Parameters />
       <Docs>
         <summary>Retrieves an iterator object that you can use to iterate over the keys associated with
-            this &lt;code&gt;DrmInfoRequest&lt;/code&gt; object.</summary>
+            this <c>DrmInfoRequest</c> object.</summary>
         <returns>The iterator object.</returns>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Drm/DrmInfoStatus.xml b/docs/Mono.Android/en/Android.Drm/DrmInfoStatus.xml
index 590f560dc7..8f73e85633 100644
--- a/docs/Mono.Android/en/Android.Drm/DrmInfoStatus.xml
+++ b/docs/Mono.Android/en/Android.Drm/DrmInfoStatus.xml
@@ -109,7 +109,7 @@
             type for <c>DrmInfoRequest</c>.</param>
         <param name="data">The processed data.</param>
         <param name="mimeType">The MIME type.</param>
-        <summary>Creates a &lt;code&gt;DrmInfoStatus&lt;/code&gt; object with the specified parameters.</summary>
+        <summary>Creates a <c>DrmInfoStatus</c> object with the specified parameters.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Drm/DrmManagerClient+IOnErrorListener.xml b/docs/Mono.Android/en/Android.Drm/DrmManagerClient+IOnErrorListener.xml
index 5dd8731387..957451a765 100644
--- a/docs/Mono.Android/en/Android.Drm/DrmManagerClient+IOnErrorListener.xml
+++ b/docs/Mono.Android/en/Android.Drm/DrmManagerClient+IOnErrorListener.xml
@@ -75,7 +75,7 @@
       <Docs>
         <param name="e">The <see cref="T:Android.Drm.DrmErrorEvent" /> instance that wraps the error type and message.
 </param>
-        <param name="client">The &lt;code&gt;DrmManagerClient&lt;/code&gt; instance.</param>
+        <param name="client">The <c>DrmManagerClient</c> instance.</param>
         <param name="event">The <c>DrmErrorEvent</c> instance that wraps the error type and message.</param>
         <summary>Called when the DRM framework sends error information.</summary>
         <remarks>
diff --git a/docs/Mono.Android/en/Android.Drm/DrmManagerClient+IOnEventListener.xml b/docs/Mono.Android/en/Android.Drm/DrmManagerClient+IOnEventListener.xml
index cf8f009dea..ff2763933f 100644
--- a/docs/Mono.Android/en/Android.Drm/DrmManagerClient+IOnEventListener.xml
+++ b/docs/Mono.Android/en/Android.Drm/DrmManagerClient+IOnEventListener.xml
@@ -77,7 +77,7 @@
         <param name="e">The <see cref="T:Android.Drm.DrmEvent" /> instance that wraps the information being
  conveyed, such as the information type and message.
 </param>
-        <param name="client">The &lt;code&gt;DrmManagerClient&lt;/code&gt; instance.</param>
+        <param name="client">The <c>DrmManagerClient</c> instance.</param>
         <param name="event">The <c>DrmEvent</c> instance that wraps the information being
             conveyed, such as the information type and message.</param>
         <summary>Called when the DRM framework sends information about a DRM processing request.</summary>
diff --git a/docs/Mono.Android/en/Android.Drm/DrmManagerClient+IOnInfoListener.xml b/docs/Mono.Android/en/Android.Drm/DrmManagerClient+IOnInfoListener.xml
index ff21b9d474..650dcbefc7 100644
--- a/docs/Mono.Android/en/Android.Drm/DrmManagerClient+IOnInfoListener.xml
+++ b/docs/Mono.Android/en/Android.Drm/DrmManagerClient+IOnInfoListener.xml
@@ -77,7 +77,7 @@
         <param name="e">The <see cref="T:Android.Drm.DrmInfoEvent" /> instance that wraps the status information or 
  warnings.
 </param>
-        <param name="client">The &lt;code&gt;DrmManagerClient&lt;/code&gt; instance.</param>
+        <param name="client">The <c>DrmManagerClient</c> instance.</param>
         <param name="event">The <c>DrmInfoEvent</c> instance that wraps the status information or 
             warnings.</param>
         <summary>Called when the DRM framework sends status or warning information during registration
diff --git a/docs/Mono.Android/en/Android.Drm/DrmManagerClient.xml b/docs/Mono.Android/en/Android.Drm/DrmManagerClient.xml
index 32ce300329..89447fd590 100644
--- a/docs/Mono.Android/en/Android.Drm/DrmManagerClient.xml
+++ b/docs/Mono.Android/en/Android.Drm/DrmManagerClient.xml
@@ -76,7 +76,7 @@
       </Parameters>
       <Docs>
         <param name="context">Context of the caller.</param>
-        <summary>Creates a &lt;code&gt;DrmManagerClient&lt;/code&gt;.</summary>
+        <summary>Creates a <c>DrmManagerClient</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -383,7 +383,7 @@
       <Docs>
         <param name="uri">URI of the rights-protected content.</param>
         <summary>Check whether the given content has valid rights.</summary>
-        <returns>An &lt;code&gt;int&lt;/code&gt; representing the <c>DrmStore.RightsStatus</c> of the content.</returns>
+        <returns>An <c>int</c> representing the <c>DrmStore.RightsStatus</c> of the content.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -434,7 +434,7 @@
       <Docs>
         <param name="path">Path to the rights-protected content.</param>
         <summary>Checks whether the given content has valid rights.</summary>
-        <returns>An &lt;code&gt;int&lt;/code&gt; representing the <c>DrmStore.RightsStatus</c> of the content.</returns>
+        <returns>An <c>int</c> representing the <c>DrmStore.RightsStatus</c> of the content.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -495,7 +495,7 @@
         <param name="action">The <c>DrmStore.Action</c> to perform.</param>
         <summary>Checks whether the given rights-protected content has valid rights for the specified
             <c>DrmStore.Action</c>.</summary>
-        <returns>An &lt;code&gt;int&lt;/code&gt; representing the <c>DrmStore.RightsStatus</c> of the content.</returns>
+        <returns>An <c>int</c> representing the <c>DrmStore.RightsStatus</c> of the content.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -556,7 +556,7 @@
         <param name="action">The <c>DrmStore.Action</c> to perform.</param>
         <summary>Checks whether the given rights-protected content has valid rights for the specified
             <c>DrmStore.Action</c>.</summary>
-        <returns>An &lt;code&gt;int&lt;/code&gt; representing the <c>DrmStore.RightsStatus</c> of the content.</returns>
+        <returns>An <c>int</c> representing the <c>DrmStore.RightsStatus</c> of the content.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -780,7 +780,7 @@
       <Docs>
         <summary>Retrieves information about all the DRM plug-ins (agents) that are registered with
             the DRM framework.</summary>
-        <returns>A &lt;code&gt;String&lt;/code&gt; array of DRM plug-in descriptions.</returns>
+        <returns>A <c>String</c> array of DRM plug-in descriptions.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -945,7 +945,7 @@
         <param name="mimeType">MIME type of the content or null.</param>
         <summary>Retrieves the type of rights-protected object (for example, content object, rights
             object, and so on) using the specified URI or MIME type.</summary>
-        <returns>An &lt;code&gt;int&lt;/code&gt; that corresponds to a <c>DrmStore.DrmObjectType</c>.</returns>
+        <returns>An <c>int</c> that corresponds to a <c>DrmStore.DrmObjectType</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -998,7 +998,7 @@
         <param name="mimeType">MIME type of the content or null.</param>
         <summary>Retrieves the type of rights-protected object (for example, content object, rights
             object, and so on) using the specified path or MIME type.</summary>
-        <returns>An &lt;code&gt;int&lt;/code&gt; that corresponds to a <c>DrmStore.DrmObjectType</c>.</returns>
+        <returns>An <c>int</c> that corresponds to a <c>DrmStore.DrmObjectType</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1134,7 +1134,7 @@
       <Docs>
         <param name="uri">URI of the rights-protected content.</param>
         <summary>Retrieves the MIME type embedded in the original content.</summary>
-        <returns>MIME type of the original content, such as &lt;code&gt;video/mpeg&lt;/code&gt;.</returns>
+        <returns>MIME type of the original content, such as <c>video/mpeg</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1179,7 +1179,7 @@
       <Docs>
         <param name="path">Path to the rights-protected content.</param>
         <summary>Retrieves the MIME type embedded in the original content.</summary>
-        <returns>The MIME type of the original content, such as &lt;code&gt;video/mpeg&lt;/code&gt;.</returns>
+        <returns>The MIME type of the original content, such as <c>video/mpeg</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Drm/DrmRights.xml b/docs/Mono.Android/en/Android.Drm/DrmRights.xml
index 15c6730b52..6dd554e10e 100644
--- a/docs/Mono.Android/en/Android.Drm/DrmRights.xml
+++ b/docs/Mono.Android/en/Android.Drm/DrmRights.xml
@@ -66,7 +66,7 @@
         <param name="data">A <c>ProcessedData</c> object containing rights information.
                         Must not be null.</param>
         <param name="mimeType">The MIME type. It must not be null or an empty string.</param>
-        <summary>Creates a &lt;code&gt;DrmRights&lt;/code&gt; object with the given parameters.</summary>
+        <summary>Creates a <c>DrmRights</c> object with the given parameters.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -109,7 +109,7 @@
       <Docs>
         <param name="rightsFile">File containing rights information.</param>
         <param name="mimeType">MIME type. Must not be null or an empty string.</param>
-        <summary>Creates a &lt;code&gt;DrmRights&lt;/code&gt; object with the given parameters.</summary>
+        <summary>Creates a <c>DrmRights</c> object with the given parameters.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -175,7 +175,7 @@
       <Docs>
         <param name="rightsFilePath">Path to the file containing rights information.</param>
         <param name="mimeType">MIME type. Must not be null or an empty string.</param>
-        <summary>Creates a &lt;code&gt;DrmRights&lt;/code&gt; object with the given parameters.</summary>
+        <summary>Creates a <c>DrmRights</c> object with the given parameters.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -220,7 +220,7 @@
         <param name="rightsFilePath">Path to the file containing rights information.</param>
         <param name="mimeType">MIME type. Must not be null or an empty string.</param>
         <param name="accountId">Account ID of the user.</param>
-        <summary>Creates a &lt;code&gt;DrmRights&lt;/code&gt; object with the given parameters.</summary>
+        <summary>Creates a <c>DrmRights</c> object with the given parameters.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -267,7 +267,7 @@
         <param name="mimeType">MIME type. Must not be null or an empty string.</param>
         <param name="accountId">Account ID of the user.</param>
         <param name="subscriptionId">Subscription ID of the user.</param>
-        <summary>Creates a &lt;code&gt;DrmRights&lt;/code&gt; object with the given parameters.</summary>
+        <summary>Creates a <c>DrmRights</c> object with the given parameters.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -307,7 +307,7 @@
         <ReturnType>System.String</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Retrieves the account ID associated with this &lt;code&gt;DrmRights&lt;/code&gt; object.</summary>
+        <summary>Retrieves the account ID associated with this <c>DrmRights</c> object.</summary>
         <value>The account ID.</value>
         <remarks>
           <para>
@@ -349,8 +349,8 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Retrieves the rights data associated with this &lt;code&gt;DrmRights&lt;/code&gt; object.</summary>
-        <returns>A &lt;code&gt;byte&lt;/code&gt; array representing the rights data.</returns>
+        <summary>Retrieves the rights data associated with this <c>DrmRights</c> object.</summary>
+        <returns>A <c>byte</c> array representing the rights data.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -421,7 +421,7 @@
         <ReturnType>System.String</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Retrieves the MIME type associated with this &lt;code&gt;DrmRights&lt;/code&gt; object.</summary>
+        <summary>Retrieves the MIME type associated with this <c>DrmRights</c> object.</summary>
         <value>The MIME type.</value>
         <remarks>
           <para>
@@ -462,7 +462,7 @@
         <ReturnType>System.String</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Retrieves the subscription ID associated with this &lt;code&gt;DrmRights&lt;/code&gt; object.</summary>
+        <summary>Retrieves the subscription ID associated with this <c>DrmRights</c> object.</summary>
         <value>The subscription ID.</value>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Gestures/Gesture+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Gestures/Gesture+InterfaceConsts.xml
index c2fdce88ff..a434bf9da1 100644
--- a/docs/Mono.Android/en/Android.Gestures/Gesture+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Gestures/Gesture+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Graphics.Drawables/AdaptiveIconDrawable.xml b/docs/Mono.Android/en/Android.Graphics.Drawables/AdaptiveIconDrawable.xml
index e2710b5e25..6a55c5932f 100644
--- a/docs/Mono.Android/en/Android.Graphics.Drawables/AdaptiveIconDrawable.xml
+++ b/docs/Mono.Android/en/Android.Graphics.Drawables/AdaptiveIconDrawable.xml
@@ -31,7 +31,7 @@
     </Attribute>
   </Attributes>
   <Docs>
-    <summary>This class can also be created via XML inflation using &lt;code&gt;&amp;lt;adaptive-icon&gt;&lt;/code&gt; tag
+    <summary>This class can also be created via XML inflation using <c>&amp;lt;adaptive-icon&gt;</c> tag
             in addition to dynamic creation.</summary>
     <remarks>
       <para>
diff --git a/docs/Mono.Android/en/Android.Graphics.Drawables/Icon+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Graphics.Drawables/Icon+InterfaceConsts.xml
index 90efcd3f43..01ac993ed4 100644
--- a/docs/Mono.Android/en/Android.Graphics.Drawables/Icon+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Graphics.Drawables/Icon+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Graphics.Drawables/Icon.xml b/docs/Mono.Android/en/Android.Graphics.Drawables/Icon.xml
index 80470ca2d9..a54c98af8d 100644
--- a/docs/Mono.Android/en/Android.Graphics.Drawables/Icon.xml
+++ b/docs/Mono.Android/en/Android.Graphics.Drawables/Icon.xml
@@ -316,7 +316,7 @@
         <param name="data">Byte array storing compressed bitmap data of a type that
                         <c>android.graphics.BitmapFactory</c>
                         can decode (see <c>android.graphics.Bitmap.CompressFormat</c>).</param>
-        <param name="offset">Offset into &lt;code&gt;data&lt;/code&gt; at which the bitmap data starts</param>
+        <param name="offset">Offset into <c>data</c> at which the bitmap data starts</param>
         <param name="length">Length of the bitmap data</param>
         <summary>Create an Icon pointing to a compressed bitmap stored in a byte array.</summary>
         <returns>To be added.</returns>
@@ -636,7 +636,7 @@
                            is available. The <c>android.os.Message#obj obj</c>
                            property is populated with the Drawable.</param>
         <summary>Invokes <c>#loadDrawable(Context)</c> on the given <c>android.os.Handler Handler</c>
-            and then sends &lt;code&gt;andThen&lt;/code&gt; to the same Handler when finished.</summary>
+            and then sends <c>andThen</c> to the same Handler when finished.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Graphics/Bitmap+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Graphics/Bitmap+InterfaceConsts.xml
index daa4d57b2c..d5289669f5 100644
--- a/docs/Mono.Android/en/Android.Graphics/Bitmap+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Graphics/Bitmap+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Graphics/BitmapFactory+Options.xml b/docs/Mono.Android/en/Android.Graphics/BitmapFactory+Options.xml
index e1c45b40a8..4cc21ba621 100644
--- a/docs/Mono.Android/en/Android.Graphics/BitmapFactory+Options.xml
+++ b/docs/Mono.Android/en/Android.Graphics/BitmapFactory+Options.xml
@@ -270,7 +270,8 @@
       </ReturnValue>
       <Docs>
         <summary>If set to true, the decoder will return null (no bitmap), but
-            the &lt;code&gt;out.</summary>
+            the <c>out...</c> fields will still be set, allowing the caller to
+            query the bitmap without having to allocate the memory for its pixels.</summary>
         <value>To be added.</value>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Graphics/Canvas.xml b/docs/Mono.Android/en/Android.Graphics/Canvas.xml
index 657c2e9997..208b3f7c68 100644
--- a/docs/Mono.Android/en/Android.Graphics/Canvas.xml
+++ b/docs/Mono.Android/en/Android.Graphics/Canvas.xml
@@ -1983,7 +1983,7 @@
       <Docs>
         <param name="glyphIds">Array of glyph IDs. The length of array must be greater than or equal to
                             <c>glyphIdOffset + glyphCount</c>.</param>
-        <param name="glyphIdOffset">Number of elements to skip before drawing in &lt;code&gt;glyphIds&lt;/code&gt;
+        <param name="glyphIdOffset">Number of elements to skip before drawing in <c>glyphIds</c>
                                 array.</param>
         <param name="positions">A flattened X and Y position array. The first glyph X position must be
                              stored at <c>positionOffset</c>. The first glyph Y position must be stored
diff --git a/docs/Mono.Android/en/Android.Graphics/ColorObject.xml b/docs/Mono.Android/en/Android.Graphics/ColorObject.xml
index 6d200b837c..248753c315 100644
--- a/docs/Mono.Android/en/Android.Graphics/ColorObject.xml
+++ b/docs/Mono.Android/en/Android.Graphics/ColorObject.xml
@@ -2410,8 +2410,8 @@
         <Parameter Name="color" Type="Android.Graphics.Color" />
       </Parameters>
       <Docs>
-        <param name="color">The ARGB color int to create a &lt;code&gt;Color&lt;/code&gt; from</param>
-        <summary>Creates a new &lt;code&gt;Color&lt;/code&gt; instance from an ARGB color int.</summary>
+        <param name="color">The ARGB color int to create a <c>Color</c> from</param>
+        <summary>Creates a new <c>Color</c> instance from an ARGB color int.</summary>
         <returns>A non-null instance of <c>Color</c></returns>
         <remarks>
           <para>
@@ -2450,8 +2450,8 @@
         <Parameter Name="color" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="color">The color long to create a &lt;code&gt;Color&lt;/code&gt; from</param>
-        <summary>Creates a new &lt;code&gt;Color&lt;/code&gt; instance from a color long.</summary>
+        <param name="color">The color long to create a <c>Color</c> from</param>
+        <summary>Creates a new <c>Color</c> instance from a color long.</summary>
         <returns>A non-null instance of <c>Color</c></returns>
         <remarks>
           <para>
@@ -2493,7 +2493,7 @@
       <Docs>
         <param name="components">The components of the color to create, with alpha as the last component</param>
         <param name="colorSpace">The color space of the color to create</param>
-        <summary>Creates a new &lt;code&gt;Color&lt;/code&gt; in the specified color space with the
+        <summary>Creates a new <c>Color</c> in the specified color space with the
             specified component values.</summary>
         <returns>A non-null instance of <c>Color</c></returns>
         <remarks>
@@ -2538,7 +2538,7 @@
         <param name="r">The red component of the opaque sRGB color to create, in \([0..1]\)</param>
         <param name="g">The green component of the opaque sRGB color to create, in \([0..1]\)</param>
         <param name="b">The blue component of the opaque sRGB color to create, in \([0..1]\)</param>
-        <summary>Creates a new opaque &lt;code&gt;Color&lt;/code&gt; in the <c>ColorSpace.Named#SRGB sRGB</c>
+        <summary>Creates a new opaque <c>Color</c> in the <c>ColorSpace.Named#SRGB sRGB</c>
             color space with the specified red, green and blue component values.</summary>
         <returns>A non-null instance of <c>Color</c></returns>
         <remarks>
@@ -2585,7 +2585,7 @@
         <param name="g">The green component of the sRGB color to create, in \([0..1]\)</param>
         <param name="b">The blue component of the sRGB color to create, in \([0..1]\)</param>
         <param name="a">The alpha component of the sRGB color to create, in \([0..1]\)</param>
-        <summary>Creates a new &lt;code&gt;Color&lt;/code&gt; in the <c>ColorSpace.Named#SRGB sRGB</c>
+        <summary>Creates a new <c>Color</c> in the <c>ColorSpace.Named#SRGB sRGB</c>
             color space with the specified red, green, blue and alpha component values.</summary>
         <returns>A non-null instance of <c>Color</c></returns>
         <remarks>
@@ -2634,7 +2634,7 @@
         <param name="b">The blue component of the color to create</param>
         <param name="a">The alpha component of the color to create, in \([0..1]\)</param>
         <param name="colorSpace">The color space of the color to create</param>
-        <summary>Creates a new &lt;code&gt;Color&lt;/code&gt; in the specified color space with the
+        <summary>Creates a new <c>Color</c> in the specified color space with the
             specified red, green, blue and alpha component values.</summary>
         <returns>A non-null instance of <c>Color</c></returns>
         <remarks>
diff --git a/docs/Mono.Android/en/Android.Graphics/Insets+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Graphics/Insets+InterfaceConsts.xml
index 2a78f689e3..e7d97e9fed 100644
--- a/docs/Mono.Android/en/Android.Graphics/Insets+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Graphics/Insets+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Graphics/ParcelableColorSpace+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Graphics/ParcelableColorSpace+InterfaceConsts.xml
index ce32d69c64..a89b62bd36 100644
--- a/docs/Mono.Android/en/Android.Graphics/ParcelableColorSpace+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Graphics/ParcelableColorSpace+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Graphics/Path.xml b/docs/Mono.Android/en/Android.Graphics/Path.xml
index 45b59d6ecc..dbad0a4f27 100644
--- a/docs/Mono.Android/en/Android.Graphics/Path.xml
+++ b/docs/Mono.Android/en/Android.Graphics/Path.xml
@@ -788,7 +788,7 @@
         <param name="acceptableError">The acceptable error for a line on the
                                    Path. Typically this would be 0.5 so that
                                    the error is less than half a pixel.</param>
-        <summary>Approximate the &lt;code&gt;Path&lt;/code&gt; with a series of line segments.</summary>
+        <summary>Approximate the <c>Path</c> with a series of line segments.</summary>
         <returns>An array of components for points approximating the Path.</returns>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Graphics/Point+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Graphics/Point+InterfaceConsts.xml
index 6ee762929a..7ff5053f6d 100644
--- a/docs/Mono.Android/en/Android.Graphics/Point+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Graphics/Point+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Graphics/PointF+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Graphics/PointF+InterfaceConsts.xml
index 9647f61287..26b5a4e6bc 100644
--- a/docs/Mono.Android/en/Android.Graphics/PointF+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Graphics/PointF+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Graphics/Rect+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Graphics/Rect+InterfaceConsts.xml
index 086eb1bb2f..7ee119da9f 100644
--- a/docs/Mono.Android/en/Android.Graphics/Rect+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Graphics/Rect+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Graphics/RectF+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Graphics/RectF+InterfaceConsts.xml
index 4adfcec164..0b18e77e87 100644
--- a/docs/Mono.Android/en/Android.Graphics/RectF+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Graphics/RectF+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Graphics/Region+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Graphics/Region+InterfaceConsts.xml
index 60e1326cde..d4c9e3c093 100644
--- a/docs/Mono.Android/en/Android.Graphics/Region+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Graphics/Region+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Graphics/RenderEffect.xml b/docs/Mono.Android/en/Android.Graphics/RenderEffect.xml
index 65122f2a69..a49a4f460e 100644
--- a/docs/Mono.Android/en/Android.Graphics/RenderEffect.xml
+++ b/docs/Mono.Android/en/Android.Graphics/RenderEffect.xml
@@ -286,11 +286,9 @@
       </Parameters>
       <Docs>
         <param name="outer">
-          <c>RenderEffect</c> that consumes the output of {</param>
-        <param name="inner}}">as its input</param>
+          <c>RenderEffect</c> that consumes the output of <paramref>inner</paramref> as its input</param>
         <param name="inner">
-          <c>RenderEffect</c> that is consumed as input by {</param>
-        <param name="outer}}">outer}</param>
+          <c>RenderEffect</c> that is consumed as input by <paramref>outer</paramref></param>
         <summary>Create a <c>RenderEffect</c> that composes 'inner' with 'outer', such that the results of
             'inner' are treated as the source bitmap passed to 'outer', i.</summary>
         <returns>To be added.</returns>
diff --git a/docs/Mono.Android/en/Android.Hardware.Camera2.Params/OutputConfiguration+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Hardware.Camera2.Params/OutputConfiguration+InterfaceConsts.xml
index 106dd2d5dc..adce85f49a 100644
--- a/docs/Mono.Android/en/Android.Hardware.Camera2.Params/OutputConfiguration+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Hardware.Camera2.Params/OutputConfiguration+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Hardware.Camera2.Params/SessionConfiguration+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Hardware.Camera2.Params/SessionConfiguration+InterfaceConsts.xml
index f8bd2b789c..10de6a6658 100644
--- a/docs/Mono.Android/en/Android.Hardware.Camera2.Params/SessionConfiguration+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Hardware.Camera2.Params/SessionConfiguration+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Hardware.Camera2/CameraAccessException.xml b/docs/Mono.Android/en/Android.Hardware.Camera2/CameraAccessException.xml
index fd95b68cd4..3510caed71 100644
--- a/docs/Mono.Android/en/Android.Hardware.Camera2/CameraAccessException.xml
+++ b/docs/Mono.Android/en/Android.Hardware.Camera2/CameraAccessException.xml
@@ -18,7 +18,8 @@
     </Attribute>
   </Attributes>
   <Docs since="21">
-    <summary>&lt;code&gt;CameraAccessException&lt;/code&gt; is thrown if a camera device could not
+    <summary>
+      <c>CameraAccessException</c> is thrown if a camera device could not
             be queried or opened by the <c>CameraManager</c>, or if the connection to an
             opened <c>CameraDevice</c> is no longer valid.</summary>
     <remarks>
diff --git a/docs/Mono.Android/en/Android.Hardware.Camera2/CameraMetadata.xml b/docs/Mono.Android/en/Android.Hardware.Camera2/CameraMetadata.xml
index 845262c89e..2616b961ca 100644
--- a/docs/Mono.Android/en/Android.Hardware.Camera2/CameraMetadata.xml
+++ b/docs/Mono.Android/en/Android.Hardware.Camera2/CameraMetadata.xml
@@ -722,7 +722,7 @@
       </ReturnValue>
       <MemberValue>17</MemberValue>
       <Docs>
-        <summary>The device supports reprocessing from the &lt;code&gt;RAW_SENSOR&lt;/code&gt; format with a bayer pattern
+        <summary>The device supports reprocessing from the <c>RAW_SENSOR</c> format with a bayer pattern
             given by <c>CameraCharacteristics#SENSOR_INFO_BINNING_FACTOR android.sensor.info.binningFactor</c> (m x n group of pixels with the same
             color filter) to a remosaiced regular bayer pattern.</summary>
         <remarks>
diff --git a/docs/Mono.Android/en/Android.Hardware.Camera2/CaptureRequest+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Hardware.Camera2/CaptureRequest+InterfaceConsts.xml
index 4d382f51c0..179913be82 100644
--- a/docs/Mono.Android/en/Android.Hardware.Camera2/CaptureRequest+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Hardware.Camera2/CaptureRequest+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Hardware.Display/DeviceProductInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Hardware.Display/DeviceProductInfo+InterfaceConsts.xml
index b5db3dfc29..edb1d999aa 100644
--- a/docs/Mono.Android/en/Android.Hardware.Display/DeviceProductInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Hardware.Display/DeviceProductInfo+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Hardware.Lights/Light+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Hardware.Lights/Light+InterfaceConsts.xml
index 7c68d9f0fa..858ed7cdd8 100644
--- a/docs/Mono.Android/en/Android.Hardware.Lights/Light+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Hardware.Lights/Light+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Hardware.Lights/LightState+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Hardware.Lights/LightState+InterfaceConsts.xml
index 2cb4424c04..2f4ea45114 100644
--- a/docs/Mono.Android/en/Android.Hardware.Lights/LightState+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Hardware.Lights/LightState+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Hardware.Usb/UsbAccessory+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Hardware.Usb/UsbAccessory+InterfaceConsts.xml
index 16938c790c..abd3d9129b 100644
--- a/docs/Mono.Android/en/Android.Hardware.Usb/UsbAccessory+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Hardware.Usb/UsbAccessory+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Hardware.Usb/UsbConfiguration+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Hardware.Usb/UsbConfiguration+InterfaceConsts.xml
index 4b441b69ab..7435c7c37e 100644
--- a/docs/Mono.Android/en/Android.Hardware.Usb/UsbConfiguration+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Hardware.Usb/UsbConfiguration+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Hardware.Usb/UsbDevice+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Hardware.Usb/UsbDevice+InterfaceConsts.xml
index d834ea5759..8423ecfe86 100644
--- a/docs/Mono.Android/en/Android.Hardware.Usb/UsbDevice+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Hardware.Usb/UsbDevice+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Hardware.Usb/UsbEndpoint+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Hardware.Usb/UsbEndpoint+InterfaceConsts.xml
index b102bde265..11b72d651a 100644
--- a/docs/Mono.Android/en/Android.Hardware.Usb/UsbEndpoint+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Hardware.Usb/UsbEndpoint+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Hardware.Usb/UsbInterface+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Hardware.Usb/UsbInterface+InterfaceConsts.xml
index f57413adf7..f977bc4f77 100644
--- a/docs/Mono.Android/en/Android.Hardware.Usb/UsbInterface+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Hardware.Usb/UsbInterface+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Hardware/HardwareBuffer+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Hardware/HardwareBuffer+InterfaceConsts.xml
index 434c77a27d..827bb5a6b2 100644
--- a/docs/Mono.Android/en/Android.Hardware/HardwareBuffer+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Hardware/HardwareBuffer+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Hardware/HardwareBuffer.xml b/docs/Mono.Android/en/Android.Hardware/HardwareBuffer.xml
index 1f0d30235c..960c02e5b8 100644
--- a/docs/Mono.Android/en/Android.Hardware/HardwareBuffer.xml
+++ b/docs/Mono.Android/en/Android.Hardware/HardwareBuffer.xml
@@ -34,7 +34,7 @@
     </Attribute>
   </Attributes>
   <Docs>
-    <summary>HardwareBuffer wraps a native &lt;code&gt;AHardwareBuffer&lt;/code&gt; object, which is a low-level object
+    <summary>HardwareBuffer wraps a native <c>AHardwareBuffer</c> object, which is a low-level object
             representing a memory buffer accessible by various hardware units.</summary>
     <remarks>
       <para>
@@ -240,7 +240,7 @@
       </ReturnValue>
       <Docs>
         <summary>Indicates whether this buffer has been closed.</summary>
-        <value>True if this &lt;code&gt;HardwareBuffer&lt;/code&gt; is in a closed state,
+        <value>True if this <c>HardwareBuffer</c> is in a closed state,
                     false otherwise.</value>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Hardware/Sensor.xml b/docs/Mono.Android/en/Android.Hardware/Sensor.xml
index b50173420d..2805da1724 100644
--- a/docs/Mono.Android/en/Android.Hardware/Sensor.xml
+++ b/docs/Mono.Android/en/Android.Hardware/Sensor.xml
@@ -233,7 +233,8 @@
       </ReturnValue>
       <Docs>
         <summary>Returns true if the sensor supports sensor additional information API</summary>
-        <value>&lt;code&gt;true&lt;/code&gt; if the sensor supports sensor additional information API</value>
+        <value>
+          <c>true</c> if the sensor supports sensor additional information API</value>
         <remarks>
           <para>
             <format type="text/html">
@@ -280,7 +281,8 @@
       <Docs>
         <param name="sharedMemType">type of shared memory used by direct channel.</param>
         <summary>Test if a sensor supports a specified direct channel type.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if the specified shared memory type is supported.</returns>
+        <returns>
+          <c>true</c> if the specified shared memory type is supported.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -316,7 +318,8 @@
       </ReturnValue>
       <Docs>
         <summary>Returns true if the sensor is a dynamic sensor.</summary>
-        <value>&lt;code&gt;true&lt;/code&gt; if the sensor is a dynamic sensor (sensor added at runtime).</value>
+        <value>
+          <c>true</c> if the sensor is a dynamic sensor (sensor added at runtime).</value>
         <remarks>
           <para>
             <format type="text/html">
@@ -352,7 +355,8 @@
       </ReturnValue>
       <Docs>
         <summary>Returns true if the sensor is a wake-up sensor.</summary>
-        <value>&lt;code&gt;true&lt;/code&gt; if this is a wake-up sensor, &lt;code&gt;false&lt;/code&gt; otherwise.</value>
+        <value>
+          <c>true</c> if this is a wake-up sensor, <c>false</c> otherwise.</value>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Hardware/SensorDirectChannel.xml b/docs/Mono.Android/en/Android.Hardware/SensorDirectChannel.xml
index c164a459b6..ab74b02549 100644
--- a/docs/Mono.Android/en/Android.Hardware/SensorDirectChannel.xml
+++ b/docs/Mono.Android/en/Android.Hardware/SensorDirectChannel.xml
@@ -163,7 +163,8 @@
       </ReturnValue>
       <Docs>
         <summary>Determine if a channel is still valid.</summary>
-        <value>&lt;code&gt;true&lt;/code&gt; if channel is valid.</value>
+        <value>
+          <c>true</c> if channel is valid.</value>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Hardware/SensorManager.xml b/docs/Mono.Android/en/Android.Hardware/SensorManager.xml
index 136ff4b5d1..7e60560dee 100644
--- a/docs/Mono.Android/en/Android.Hardware/SensorManager.xml
+++ b/docs/Mono.Android/en/Android.Hardware/SensorManager.xml
@@ -214,7 +214,8 @@
         <param name="listener">A <c>android.hardware.SensorEventListener SensorEventListener</c> object
                    which was previously used in a registerListener call.</param>
         <summary>Flushes the FIFO of all the sensors registered for this listener.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if the flush is initiated successfully on all the sensors
+        <returns>
+          <c>true</c> if the flush is initiated successfully on all the sensors
                     registered for this listener, false if no sensor is previously registered for this
                     listener or flush on one of the sensors fails.</returns>
         <remarks>
@@ -681,7 +682,8 @@
             &lt;b&gt;R&lt;/b&gt; transforming a vector from the device coordinate system to the
             world's coordinate system which is defined as a direct orthonormal basis,
             where:</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; on success, &lt;code&gt;false&lt;/code&gt; on failure (for
+        <returns>
+          <c>true</c> on success, <c>false</c> on failure (for
                     instance, if the device is in free fall). Free fall is defined as
                     condition when the magnitude of the gravity is less than 1/10 of
                     the nominal value. On failure the output matrices are not modified.</returns>
@@ -1297,7 +1299,8 @@
       </ReturnValue>
       <Docs>
         <summary>Tell if dynamic sensor discovery feature is supported by system.</summary>
-        <value>&lt;code&gt;true&lt;/code&gt; if dynamic sensor discovery is supported, &lt;code&gt;false&lt;/code&gt;
+        <value>
+          <c>true</c> if dynamic sensor discovery is supported, <c>false</c>
             otherwise.</value>
         <remarks>
           <para>
@@ -1870,7 +1873,8 @@
         <param name="listener">sensor listener object</param>
         <param name="sensors">a bit masks of the sensors to register to</param>
         <summary>Registers a listener for given sensors.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if the sensor is supported and successfully
+        <returns>
+          <c>true</c> if the sensor is supported and successfully
                     enabled</returns>
         <remarks>
           <para>
@@ -1931,7 +1935,8 @@
                        the <c>SENSOR_DELAY_*</c> constants.</param>
         <summary>Registers a <c>android.hardware.SensorEventListener SensorEventListener</c> for the given
             sensor at the given sampling frequency.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if the sensor is supported and successfully enabled.</returns>
+        <returns>
+          <c>true</c> if the sensor is supported and successfully enabled.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1996,7 +2001,8 @@
                    <c>#SENSOR_DELAY_NORMAL</c>, <c>#SENSOR_DELAY_UI</c>,
                    <c>#SENSOR_DELAY_GAME</c>, or <c>#SENSOR_DELAY_FASTEST</c>.</param>
         <summary>Registers a SensorListener for given sensors.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if the sensor is supported and successfully
+        <returns>
+          <c>true</c> if the sensor is supported and successfully
                     enabled</returns>
         <remarks>
           <para>
@@ -2060,7 +2066,8 @@
                        sensor events</c> will be delivered to.</param>
         <summary>Registers a <c>android.hardware.SensorEventListener SensorEventListener</c> for the given
             sensor.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if the sensor is supported and successfully enabled.</returns>
+        <returns>
+          <c>true</c> if the sensor is supported and successfully enabled.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -2132,7 +2139,8 @@
                        <c>#registerListener(SensorEventListener, Sensor, int)</c>.</param>
         <summary>Registers a <c>android.hardware.SensorEventListener SensorEventListener</c> for the given
             sensor at the given sampling frequency and the given maximum reporting latency.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if the sensor is supported and successfully enabled.</returns>
+        <returns>
+          <c>true</c> if the sensor is supported and successfully enabled.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -2204,7 +2212,8 @@
                        sensor events</c> will be delivered to.</param>
         <summary>Registers a <c>android.hardware.SensorEventListener SensorEventListener</c> for the given
             sensor at the given sampling frequency and the given maximum reporting latency.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if the sensor is supported and successfully enabled.</returns>
+        <returns>
+          <c>true</c> if the sensor is supported and successfully enabled.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -2270,7 +2279,8 @@
                    array.</param>
         <summary>Rotates the supplied rotation matrix so it is expressed in a different
             coordinate system.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; on success. &lt;code&gt;false&lt;/code&gt; if the input
+        <returns>
+          <c>true</c> on success. <c>false</c> if the input
                     parameters are incorrect, for instance if X and Y define the same
                     axis. Or if inR and outR don't have the same length.</returns>
         <remarks>
diff --git a/docs/Mono.Android/en/Android.Locations.Provider/ProviderProperties+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Locations.Provider/ProviderProperties+InterfaceConsts.xml
index e882b28c7a..f9fc1725be 100644
--- a/docs/Mono.Android/en/Android.Locations.Provider/ProviderProperties+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Locations.Provider/ProviderProperties+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Locations/Address+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Locations/Address+InterfaceConsts.xml
index 10feb3e129..ace1088253 100644
--- a/docs/Mono.Android/en/Android.Locations/Address+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Locations/Address+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Locations/Criteria+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Locations/Criteria+InterfaceConsts.xml
index 4778cba5eb..44609f07e2 100644
--- a/docs/Mono.Android/en/Android.Locations/Criteria+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Locations/Criteria+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Locations/GnssAntennaInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Locations/GnssAntennaInfo+InterfaceConsts.xml
index 1e54aad794..6013832451 100644
--- a/docs/Mono.Android/en/Android.Locations/GnssAntennaInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Locations/GnssAntennaInfo+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Locations/GnssAntennaInfo+PhaseCenterOffset+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Locations/GnssAntennaInfo+PhaseCenterOffset+InterfaceConsts.xml
index 23de83826a..4c72e6c0b6 100644
--- a/docs/Mono.Android/en/Android.Locations/GnssAntennaInfo+PhaseCenterOffset+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Locations/GnssAntennaInfo+PhaseCenterOffset+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Locations/GnssAntennaInfo+SphericalCorrections+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Locations/GnssAntennaInfo+SphericalCorrections+InterfaceConsts.xml
index 8bca18d696..a7dc51ccd7 100644
--- a/docs/Mono.Android/en/Android.Locations/GnssAntennaInfo+SphericalCorrections+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Locations/GnssAntennaInfo+SphericalCorrections+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Locations/GnssCapabilities+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Locations/GnssCapabilities+InterfaceConsts.xml
index c45cac85e5..a665fff26d 100644
--- a/docs/Mono.Android/en/Android.Locations/GnssCapabilities+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Locations/GnssCapabilities+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Locations/GnssClock+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Locations/GnssClock+InterfaceConsts.xml
index 1a31b07b8a..51996ab955 100644
--- a/docs/Mono.Android/en/Android.Locations/GnssClock+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Locations/GnssClock+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Locations/GnssMeasurement+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Locations/GnssMeasurement+InterfaceConsts.xml
index 58014db374..f27ff52474 100644
--- a/docs/Mono.Android/en/Android.Locations/GnssMeasurement+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Locations/GnssMeasurement+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Locations/GnssMeasurementRequest+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Locations/GnssMeasurementRequest+InterfaceConsts.xml
index a29dd30943..d90471c4db 100644
--- a/docs/Mono.Android/en/Android.Locations/GnssMeasurementRequest+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Locations/GnssMeasurementRequest+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Locations/GnssMeasurementsEvent+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Locations/GnssMeasurementsEvent+InterfaceConsts.xml
index 1676262e63..6074abb985 100644
--- a/docs/Mono.Android/en/Android.Locations/GnssMeasurementsEvent+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Locations/GnssMeasurementsEvent+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Locations/GnssNavigationMessage+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Locations/GnssNavigationMessage+InterfaceConsts.xml
index 83240ec83d..1e2d4e1aa6 100644
--- a/docs/Mono.Android/en/Android.Locations/GnssNavigationMessage+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Locations/GnssNavigationMessage+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Locations/GnssStatus+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Locations/GnssStatus+InterfaceConsts.xml
index 5a196992f3..939b0171f4 100644
--- a/docs/Mono.Android/en/Android.Locations/GnssStatus+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Locations/GnssStatus+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Locations/Location+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Locations/Location+InterfaceConsts.xml
index 68c3482195..55ef14e187 100644
--- a/docs/Mono.Android/en/Android.Locations/Location+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Locations/Location+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Locations/LocationRequest+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Locations/LocationRequest+InterfaceConsts.xml
index 12f66ec889..e31c5f717a 100644
--- a/docs/Mono.Android/en/Android.Locations/LocationRequest+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Locations/LocationRequest+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Media.Audiofx/Virtualizer.xml b/docs/Mono.Android/en/Android.Media.Audiofx/Virtualizer.xml
index 2d99284a6c..42ebdc3bc9 100644
--- a/docs/Mono.Android/en/Android.Media.Audiofx/Virtualizer.xml
+++ b/docs/Mono.Android/en/Android.Media.Audiofx/Virtualizer.xml
@@ -278,14 +278,14 @@
         <param name="angles">a non-null array whose length is 3 times the number of channels in the channel
                mask.
                If the method indicates the configuration is supported, the array will contain upon return
-               triplets of values: for each channel &lt;code&gt;i&lt;/code&gt; among the channels of the mask:
+               triplets of values: for each channel <c>i</c> among the channels of the mask:
                &lt;ul&gt;
-                 &lt;li&gt;the element at index &lt;code&gt;3*i&lt;/code&gt; in the array contains the speaker
+                 &lt;li&gt;the element at index <c>3*i</c> in the array contains the speaker
                      identification (e.g. <c>AudioFormat#CHANNEL_OUT_FRONT_LEFT</c>),&lt;/li&gt;
-                 &lt;li&gt;the element at index &lt;code&gt;3*i+1&lt;/code&gt; contains its corresponding azimuth angle
+                 &lt;li&gt;the element at index <c>3*i+1</c> contains its corresponding azimuth angle
                      expressed in degrees, where 0 is the direction the listener faces, 180 is behind
                      the listener, and -90 is to her/his left,&lt;/li&gt;
-                 &lt;li&gt;the element at index &lt;code&gt;3*i+2&lt;/code&gt; contains its corresponding elevation angle
+                 &lt;li&gt;the element at index <c>3*i+2</c> contains its corresponding elevation angle
                      where +90 is directly above the listener, 0 is the horizontal plane, and -90 is
                      directly below the listener.&lt;/li&gt;</param>
         <summary>Queries the virtual speaker angles (azimuth and elevation) for a combination of a channel
diff --git a/docs/Mono.Android/en/Android.Media.Browse/MediaBrowser+MediaItem+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Media.Browse/MediaBrowser+MediaItem+InterfaceConsts.xml
index f886df85e9..d2ee5b95cf 100644
--- a/docs/Mono.Android/en/Android.Media.Browse/MediaBrowser+MediaItem+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Media.Browse/MediaBrowser+MediaItem+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Media.Metrics/NetworkEvent+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Media.Metrics/NetworkEvent+InterfaceConsts.xml
index 761117ab90..702cfbee5c 100644
--- a/docs/Mono.Android/en/Android.Media.Metrics/NetworkEvent+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Media.Metrics/NetworkEvent+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Media.Metrics/PlaybackErrorEvent+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Media.Metrics/PlaybackErrorEvent+InterfaceConsts.xml
index 9c221be513..c1bfe4e3ba 100644
--- a/docs/Mono.Android/en/Android.Media.Metrics/PlaybackErrorEvent+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Media.Metrics/PlaybackErrorEvent+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Media.Metrics/PlaybackMetrics+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Media.Metrics/PlaybackMetrics+InterfaceConsts.xml
index 7b8211c4d9..34151f3a39 100644
--- a/docs/Mono.Android/en/Android.Media.Metrics/PlaybackMetrics+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Media.Metrics/PlaybackMetrics+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Media.Metrics/PlaybackStateEvent+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Media.Metrics/PlaybackStateEvent+InterfaceConsts.xml
index a48c4db01f..cdbbeadecb 100644
--- a/docs/Mono.Android/en/Android.Media.Metrics/PlaybackStateEvent+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Media.Metrics/PlaybackStateEvent+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Media.Metrics/TrackChangeEvent+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Media.Metrics/TrackChangeEvent+InterfaceConsts.xml
index c2fd560db7..7ac7d0a931 100644
--- a/docs/Mono.Android/en/Android.Media.Metrics/TrackChangeEvent+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Media.Metrics/TrackChangeEvent+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Media.Midi/MidiDeviceInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Media.Midi/MidiDeviceInfo+InterfaceConsts.xml
index 0379feb28d..a516d0bf45 100644
--- a/docs/Mono.Android/en/Android.Media.Midi/MidiDeviceInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Media.Midi/MidiDeviceInfo+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Media.Midi/MidiDeviceStatus+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Media.Midi/MidiDeviceStatus+InterfaceConsts.xml
index a61ab2a7a2..97a0f2bff3 100644
--- a/docs/Mono.Android/en/Android.Media.Midi/MidiDeviceStatus+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Media.Midi/MidiDeviceStatus+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Media.Session/MediaController+PlaybackInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Media.Session/MediaController+PlaybackInfo+InterfaceConsts.xml
index 5597f1d2a5..2ec0264101 100644
--- a/docs/Mono.Android/en/Android.Media.Session/MediaController+PlaybackInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Media.Session/MediaController+PlaybackInfo+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Media.Session/MediaSession+QueueItem+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Media.Session/MediaSession+QueueItem+InterfaceConsts.xml
index 145f9d4d35..ee8b4ebaa1 100644
--- a/docs/Mono.Android/en/Android.Media.Session/MediaSession+QueueItem+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Media.Session/MediaSession+QueueItem+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Media.Session/MediaSession+Token+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Media.Session/MediaSession+Token+InterfaceConsts.xml
index 69d4a311be..e3c743a449 100644
--- a/docs/Mono.Android/en/Android.Media.Session/MediaSession+Token+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Media.Session/MediaSession+Token+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Media.Session/PlaybackState+CustomAction+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Media.Session/PlaybackState+CustomAction+InterfaceConsts.xml
index c67e4712e1..4219e4cd67 100644
--- a/docs/Mono.Android/en/Android.Media.Session/PlaybackState+CustomAction+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Media.Session/PlaybackState+CustomAction+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Media.Session/PlaybackState+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Media.Session/PlaybackState+InterfaceConsts.xml
index 8919bae322..e67bda6bbd 100644
--- a/docs/Mono.Android/en/Android.Media.Session/PlaybackState+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Media.Session/PlaybackState+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Media.TV/TvInputInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Media.TV/TvInputInfo+InterfaceConsts.xml
index 54d78fba41..2d1478c494 100644
--- a/docs/Mono.Android/en/Android.Media.TV/TvInputInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Media.TV/TvInputInfo+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Media.TV/TvInputManager+TvInputCallback.xml b/docs/Mono.Android/en/Android.Media.TV/TvInputManager+TvInputCallback.xml
index dab6d54d57..f174a8815d 100644
--- a/docs/Mono.Android/en/Android.Media.TV/TvInputManager+TvInputCallback.xml
+++ b/docs/Mono.Android/en/Android.Media.TV/TvInputManager+TvInputCallback.xml
@@ -300,7 +300,7 @@
         <Parameter Name="inputInfo" Type="Android.Media.TV.TvInputInfo" />
       </Parameters>
       <Docs>
-        <param name="inputInfo">The &lt;code&gt;TvInputInfo&lt;/code&gt; object that contains new information.</param>
+        <param name="inputInfo">The <c>TvInputInfo</c> object that contains new information.</param>
         <summary>This is called when the information about an existing TV input has been updated.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Media.TV/TvInputManager.xml b/docs/Mono.Android/en/Android.Media.TV/TvInputManager.xml
index bb0eb7a93b..a17154c8e5 100644
--- a/docs/Mono.Android/en/Android.Media.TV/TvInputManager.xml
+++ b/docs/Mono.Android/en/Android.Media.TV/TvInputManager.xml
@@ -591,7 +591,7 @@
             <c>TvRecordingClient.RecordingCallback#onError(int)</c>: The requested operation cannot be
             completed due to a problem that does not fit under any other error codes, or the error code
             for the problem is defined on the higher version than application's
-            &lt;code&gt;android:targetSdkVersion&lt;/code&gt;.</summary>
+            <c>android:targetSdkVersion</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -849,8 +849,8 @@
         <Parameter Name="inputInfo" Type="Android.Media.TV.TvInputInfo" />
       </Parameters>
       <Docs>
-        <param name="inputInfo">The &lt;code&gt;TvInputInfo&lt;/code&gt; object that contains new information.</param>
-        <summary>Updates the &lt;code&gt;TvInputInfo&lt;/code&gt; for an existing TV input.</summary>
+        <param name="inputInfo">The <c>TvInputInfo</c> object that contains new information.</param>
+        <summary>Updates the <c>TvInputInfo</c> for an existing TV input.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Media.TV/TvTrackInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Media.TV/TvTrackInfo+InterfaceConsts.xml
index 7f22c13fed..e2033c1de2 100644
--- a/docs/Mono.Android/en/Android.Media.TV/TvTrackInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Media.TV/TvTrackInfo+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Media/ApplicationMediaCapabilities+Builder.xml b/docs/Mono.Android/en/Android.Media/ApplicationMediaCapabilities+Builder.xml
index cd0d5cde26..8330cbc92c 100644
--- a/docs/Mono.Android/en/Android.Media/ApplicationMediaCapabilities+Builder.xml
+++ b/docs/Mono.Android/en/Android.Media/ApplicationMediaCapabilities+Builder.xml
@@ -204,7 +204,7 @@
       <Docs>
         <summary>Builds a <c>ApplicationMediaCapabilities</c> object.</summary>
         <returns>a new <c>ApplicationMediaCapabilities</c> instance successfully initialized
-            with all the parameters set on this &lt;code&gt;Builder&lt;/code&gt;.</returns>
+            with all the parameters set on this <c>Builder</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Media/ApplicationMediaCapabilities+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Media/ApplicationMediaCapabilities+InterfaceConsts.xml
index 74fddf876f..d1aad4563c 100644
--- a/docs/Mono.Android/en/Android.Media/ApplicationMediaCapabilities+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Media/ApplicationMediaCapabilities+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Media/AudioAttributes+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Media/AudioAttributes+InterfaceConsts.xml
index dff5a8e485..e834027cfe 100644
--- a/docs/Mono.Android/en/Android.Media/AudioAttributes+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Media/AudioAttributes+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Media/AudioDeviceInfo.xml b/docs/Mono.Android/en/Android.Media/AudioDeviceInfo.xml
index 90ac7d92bd..01475511a7 100644
--- a/docs/Mono.Android/en/Android.Media/AudioDeviceInfo.xml
+++ b/docs/Mono.Android/en/Android.Media/AudioDeviceInfo.xml
@@ -363,9 +363,9 @@
         <summary>To be added.</summary>
         <returns>An array of audio encodings (e.g. <c>AudioFormat#ENCODING_PCM_16BIT</c>,
             <c>AudioFormat#ENCODING_PCM_FLOAT</c>) supported by the audio device.
-            &lt;code&gt;ENCODING_PCM_FLOAT&lt;/code&gt; indicates the device supports more
+            <c>ENCODING_PCM_FLOAT</c> indicates the device supports more
             than 16 bits of integer precision.  As there is no AudioFormat constant
-            specifically defined for 24-bit PCM, the value &lt;code&gt;ENCODING_PCM_FLOAT&lt;/code&gt;
+            specifically defined for 24-bit PCM, the value <c>ENCODING_PCM_FLOAT</c>
             indicates that <c>AudioTrack</c> or <c>AudioRecord</c> can preserve at least 24 bits of
             integer precision to that device.</returns>
         <remarks>
diff --git a/docs/Mono.Android/en/Android.Media/AudioFormat+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Media/AudioFormat+InterfaceConsts.xml
index 2f900cc805..ce8309ee7a 100644
--- a/docs/Mono.Android/en/Android.Media/AudioFormat+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Media/AudioFormat+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Media/AudioManager.xml b/docs/Mono.Android/en/Android.Media/AudioManager.xml
index 1039fd3840..c922619678 100644
--- a/docs/Mono.Android/en/Android.Media/AudioManager.xml
+++ b/docs/Mono.Android/en/Android.Media/AudioManager.xml
@@ -2392,7 +2392,7 @@
         <param name="flags">A set of bitflags specifying the criteria to test.</param>
         <summary>Returns an array of <c>AudioDeviceInfo</c> objects corresponding to the audio devices
             currently connected to the system and meeting the criteria specified in the
-            &lt;code&gt;flags&lt;/code&gt; parameter.</summary>
+            <c>flags</c> parameter.</summary>
         <returns>A (possibly zero-length) array of AudioDeviceInfo objects.</returns>
         <remarks>
           <para>
@@ -3952,7 +3952,7 @@
         <param name="callback">The <c>AudioDeviceCallback</c> object to receive connect/disconnect
             notifications.</param>
         <param name="handler">Specifies the <c>Handler</c> object for the thread on which to execute
-            the callback. If &lt;code&gt;null&lt;/code&gt;, the <c>Handler</c> associated with the main
+            the callback. If <c>null</c>, the <c>Handler</c> associated with the main
             <c>Looper</c> will be used.</param>
         <summary>Registers an <c>AudioDeviceCallback</c> object to receive notifications of changes
             to the set of connected audio devices.</summary>
@@ -4726,7 +4726,8 @@
         <param name="device">the requested audio device.</param>
         <summary>Selects the audio device that should be used for communication use cases, for instance voice
             or video calls.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if the request was accepted, &lt;code&gt;false&lt;/code&gt; otherwise.</returns>
+        <returns>
+          <c>true</c> if the request was accepted, <c>false</c> otherwise.</returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Media/AudioPlaybackConfiguration+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Media/AudioPlaybackConfiguration+InterfaceConsts.xml
index 411df31afc..5947e32447 100644
--- a/docs/Mono.Android/en/Android.Media/AudioPlaybackConfiguration+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Media/AudioPlaybackConfiguration+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Media/AudioRecord+Builder.xml b/docs/Mono.Android/en/Android.Media/AudioRecord+Builder.xml
index 32dc501278..f8a18962dd 100644
--- a/docs/Mono.Android/en/Android.Media/AudioRecord+Builder.xml
+++ b/docs/Mono.Android/en/Android.Media/AudioRecord+Builder.xml
@@ -111,7 +111,7 @@
       <Docs>
         <summary>To be added.</summary>
         <returns>a new <c>AudioRecord</c> instance successfully initialized with all
-                the parameters set on this &lt;code&gt;Builder&lt;/code&gt;.</returns>
+                the parameters set on this <c>Builder</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Media/AudioRecord.xml b/docs/Mono.Android/en/Android.Media/AudioRecord.xml
index 6981cbea12..d86fdbe1bf 100644
--- a/docs/Mono.Android/en/Android.Media/AudioRecord.xml
+++ b/docs/Mono.Android/en/Android.Media/AudioRecord.xml
@@ -467,8 +467,8 @@
         <ReturnType>System.Int32</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Returns the frame count of the native &lt;code&gt;AudioRecord&lt;/code&gt; buffer.</summary>
-        <value>current size in frames of the &lt;code&gt;AudioRecord&lt;/code&gt; buffer.</value>
+        <summary>Returns the frame count of the native <c>AudioRecord</c> buffer.</summary>
+        <value>current size in frames of the <c>AudioRecord</c> buffer.</value>
         <remarks>
           <para>
             <format type="text/html">
@@ -577,9 +577,9 @@
         <ReturnType>Android.Media.AudioFormat</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Returns the configured &lt;code&gt;AudioRecord&lt;/code&gt; format.</summary>
+        <summary>Returns the configured <c>AudioRecord</c> format.</summary>
         <value>an <c>AudioFormat</c> containing the
-            &lt;code&gt;AudioRecord&lt;/code&gt; parameters at the time of configuration.</value>
+            <c>AudioRecord</c> parameters at the time of configuration.</value>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Media/AudioRecordingConfiguration+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Media/AudioRecordingConfiguration+InterfaceConsts.xml
index 6c43cb86ce..5e115ea992 100644
--- a/docs/Mono.Android/en/Android.Media/AudioRecordingConfiguration+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Media/AudioRecordingConfiguration+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Media/AudioTrack+Builder.xml b/docs/Mono.Android/en/Android.Media/AudioTrack+Builder.xml
index 8302a766f4..5602cb23d7 100644
--- a/docs/Mono.Android/en/Android.Media/AudioTrack+Builder.xml
+++ b/docs/Mono.Android/en/Android.Media/AudioTrack+Builder.xml
@@ -110,7 +110,7 @@
       <Parameters />
       <Docs>
         <summary>Builds an <c>AudioTrack</c> instance initialized with all the parameters set
-            on this &lt;code&gt;Builder&lt;/code&gt;.</summary>
+            on this <c>Builder</c>.</summary>
         <returns>a new successfully initialized <c>AudioTrack</c> instance.</returns>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Media/AudioTrack.xml b/docs/Mono.Android/en/Android.Media/AudioTrack.xml
index 112d29627e..f57e37bbfc 100644
--- a/docs/Mono.Android/en/Android.Media/AudioTrack.xml
+++ b/docs/Mono.Android/en/Android.Media/AudioTrack.xml
@@ -114,15 +114,15 @@
               this is the maximum length sample, or audio clip, that can be played by this instance.
               &lt;p&gt; If the track's creation mode is <c>#MODE_STREAM</c>,
               this should be the desired buffer size
-              for the &lt;code&gt;AudioTrack&lt;/code&gt; to satisfy the application's
+              for the <c>AudioTrack</c> to satisfy the application's
               latency requirements.
-              If &lt;code&gt;bufferSizeInBytes&lt;/code&gt; is less than the
+              If <c>bufferSizeInBytes</c> is less than the
               minimum buffer size for the output sink, it is increased to the minimum
               buffer size.
               The method <c>#getBufferSizeInFrames()</c> returns the
               actual size in frames of the buffer created, which
               determines the minimum frequency to write
-              to the streaming &lt;code&gt;AudioTrack&lt;/code&gt; to avoid underrun.
+              to the streaming <c>AudioTrack</c> to avoid underrun.
               See <c>#getMinBufferSize(int, int, int)</c> to determine the estimated minimum buffer size
               for an AudioTrack instance in streaming mode.</param>
         <param name="mode">streaming or static buffer. See <c>#MODE_STATIC</c> and <c>#MODE_STREAM</c>.</param>
@@ -291,15 +291,15 @@
               this is the maximum length sample, or audio clip, that can be played by this instance.
               &lt;p&gt; If the track's creation mode is <c>#MODE_STREAM</c>,
               this should be the desired buffer size
-              for the &lt;code&gt;AudioTrack&lt;/code&gt; to satisfy the application's
+              for the <c>AudioTrack</c> to satisfy the application's
               latency requirements.
-              If &lt;code&gt;bufferSizeInBytes&lt;/code&gt; is less than the
+              If <c>bufferSizeInBytes</c> is less than the
               minimum buffer size for the output sink, it is increased to the minimum
               buffer size.
               The method <c>#getBufferSizeInFrames()</c> returns the
               actual size in frames of the buffer created, which
               determines the minimum frequency to write
-              to the streaming &lt;code&gt;AudioTrack&lt;/code&gt; to avoid underrun.
+              to the streaming <c>AudioTrack</c> to avoid underrun.
               See <c>#getMinBufferSize(int, int, int)</c> to determine the estimated minimum buffer size
               for an AudioTrack instance in streaming mode.</param>
         <param name="mode">streaming or static buffer. See <c>#MODE_STATIC</c> and <c>#MODE_STREAM</c></param>
@@ -466,15 +466,15 @@
               this is the maximum length sample, or audio clip, that can be played by this instance.
               &lt;p&gt; If the track's creation mode is <c>#MODE_STREAM</c>,
               this should be the desired buffer size
-              for the &lt;code&gt;AudioTrack&lt;/code&gt; to satisfy the application's
+              for the <c>AudioTrack</c> to satisfy the application's
               latency requirements.
-              If &lt;code&gt;bufferSizeInBytes&lt;/code&gt; is less than the
+              If <c>bufferSizeInBytes</c> is less than the
               minimum buffer size for the output sink, it is increased to the minimum
               buffer size.
               The method <c>#getBufferSizeInFrames()</c> returns the
               actual size in frames of the buffer created, which
               determines the minimum frequency to write
-              to the streaming &lt;code&gt;AudioTrack&lt;/code&gt; to avoid underrun.
+              to the streaming <c>AudioTrack</c> to avoid underrun.
               You can write data into this buffer in smaller chunks than this size.
               See <c>#getMinBufferSize(int, int, int)</c> to determine the estimated minimum buffer size
               for an AudioTrack instance in streaming mode.</param>
@@ -857,8 +857,8 @@
         <ReturnType>System.Int32</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Returns the maximum size of the &lt;code&gt;AudioTrack&lt;/code&gt; buffer in frames.</summary>
-        <value>maximum size in frames of the &lt;code&gt;AudioTrack&lt;/code&gt; buffer.</value>
+        <summary>Returns the maximum size of the <c>AudioTrack</c> buffer in frames.</summary>
+        <value>maximum size in frames of the <c>AudioTrack</c> buffer.</value>
         <remarks>
           <para>
             <format type="text/html">
@@ -893,9 +893,9 @@
         <ReturnType>System.Int32</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Returns the effective size of the &lt;code&gt;AudioTrack&lt;/code&gt; buffer
+        <summary>Returns the effective size of the <c>AudioTrack</c> buffer
             that the application writes to.</summary>
-        <value>current size in frames of the &lt;code&gt;AudioTrack&lt;/code&gt; buffer.</value>
+        <value>current size in frames of the <c>AudioTrack</c> buffer.</value>
         <remarks>
           <para>
             <format type="text/html">
@@ -1604,9 +1604,9 @@
         <ReturnType>Android.Media.AudioFormat</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Returns the configured &lt;code&gt;AudioTrack&lt;/code&gt; format.</summary>
+        <summary>Returns the configured <c>AudioTrack</c> format.</summary>
         <value>an <c>AudioFormat</c> containing the
-            &lt;code&gt;AudioTrack&lt;/code&gt; parameters at the time of configuration.</value>
+            <c>AudioTrack</c> parameters at the time of configuration.</value>
         <remarks>
           <para>
             <format type="text/html">
@@ -2118,8 +2118,8 @@
         <ReturnType>System.Int32</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Returns the frame count of the native &lt;code&gt;AudioTrack&lt;/code&gt; buffer.</summary>
-        <value>current size in frames of the &lt;code&gt;AudioTrack&lt;/code&gt; buffer.</value>
+        <summary>Returns the frame count of the native <c>AudioTrack</c> buffer.</summary>
+        <value>current size in frames of the <c>AudioTrack</c> buffer.</value>
         <remarks>
           <para>
             <format type="text/html">
@@ -3086,7 +3086,7 @@
       </Parameters>
       <Docs>
         <param name="bufferSizeInFrames">requested buffer size in frames</param>
-        <summary>Limits the effective size of the &lt;code&gt;AudioTrack&lt;/code&gt; buffer
+        <summary>Limits the effective size of the <c>AudioTrack</c> buffer
             that the application writes to.</summary>
         <returns>the actual buffer size in frames or an error code,
                <c>#ERROR_BAD_VALUE</c>, <c>#ERROR_INVALID_OPERATION</c></returns>
@@ -3691,7 +3691,7 @@
       </Parameters>
       <Docs>
         <param name="startThresholdInFrames">the desired start threshold.</param>
-        <summary>Sets the streaming start threshold for an &lt;code&gt;AudioTrack&lt;/code&gt;.</summary>
+        <summary>Sets the streaming start threshold for an <c>AudioTrack</c>.</summary>
         <returns>the actual start threshold in frames value. This is
                     an integer between 1 to the buffer capacity
                     (see <c>#getBufferCapacityInFrames()</c>),
@@ -3875,7 +3875,7 @@
         <ReturnType>System.Int32</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Returns the streaming start threshold of the &lt;code&gt;AudioTrack&lt;/code&gt;.</summary>
+        <summary>Returns the streaming start threshold of the <c>AudioTrack</c>.</summary>
         <value>the current start threshold in frames value. This is
                     an integer between 1 to the buffer capacity
                     (see <c>#getBufferCapacityInFrames()</c>),
@@ -4219,14 +4219,14 @@
       </Parameters>
       <Docs>
         <param name="audioData">the buffer that holds the data to write, starting at the position reported
-                by &lt;code&gt;audioData.position()&lt;/code&gt;.
-                &lt;BR&gt;Note that upon return, the buffer position (&lt;code&gt;audioData.position()&lt;/code&gt;) will
+                by <c>audioData.position()</c>.
+                &lt;BR&gt;Note that upon return, the buffer position (<c>audioData.position()</c>) will
                 have been advanced to reflect the amount of data that was successfully written to
                 the AudioTrack.</param>
         <param name="sizeInBytes">number of bytes to write.  It is recommended but not enforced
                 that the number of bytes requested be a multiple of the frame size (sample size in
                 bytes multiplied by the channel count).
-                &lt;BR&gt;Note this may differ from &lt;code&gt;audioData.remaining()&lt;/code&gt;, but cannot exceed it.</param>
+                &lt;BR&gt;Note this may differ from <c>audioData.remaining()</c>, but cannot exceed it.</param>
         <param name="writeMode">one of <c>#WRITE_BLOCKING</c>, <c>#WRITE_NON_BLOCKING</c>. It has no
                 effect in static mode.
                 &lt;BR&gt;With <c>#WRITE_BLOCKING</c>, the write will block until all data has been written
@@ -4303,7 +4303,7 @@
                successfully transferred. In this case, the error is returned at the next write()&lt;/li&gt;
             &lt;li&gt;<c>#ERROR</c> in case of other error&lt;/li&gt;
             &lt;/ul&gt;
-            This is equivalent to <c>#write(byte[], int, int, int)</c> with &lt;code&gt;writeMode&lt;/code&gt;
+            This is equivalent to <c>#write(byte[], int, int, int)</c> with <c>writeMode</c>
             set to  <c>#WRITE_BLOCKING</c>.</returns>
         <remarks>
           <para>
@@ -4364,7 +4364,7 @@
                successfully transferred. In this case, the error is returned at the next write()&lt;/li&gt;
             &lt;li&gt;<c>#ERROR</c> in case of other error&lt;/li&gt;
             &lt;/ul&gt;
-            This is equivalent to <c>#write(short[], int, int, int)</c> with &lt;code&gt;writeMode&lt;/code&gt;
+            This is equivalent to <c>#write(short[], int, int, int)</c> with <c>writeMode</c>
             set to  <c>#WRITE_BLOCKING</c>.</returns>
         <remarks>
           <para>
@@ -4415,14 +4415,14 @@
       </Parameters>
       <Docs>
         <param name="audioData">the buffer that holds the data to write, starting at the position reported
-                by &lt;code&gt;audioData.position()&lt;/code&gt;.
-                &lt;BR&gt;Note that upon return, the buffer position (&lt;code&gt;audioData.position()&lt;/code&gt;) will
+                by <c>audioData.position()</c>.
+                &lt;BR&gt;Note that upon return, the buffer position (<c>audioData.position()</c>) will
                 have been advanced to reflect the amount of data that was successfully written to
                 the AudioTrack.</param>
         <param name="sizeInBytes">number of bytes to write.  It is recommended but not enforced
                 that the number of bytes requested be a multiple of the frame size (sample size in
                 bytes multiplied by the channel count).
-                &lt;BR&gt;Note this may differ from &lt;code&gt;audioData.remaining()&lt;/code&gt;, but cannot exceed it.</param>
+                &lt;BR&gt;Note this may differ from <c>audioData.remaining()</c>, but cannot exceed it.</param>
         <param name="writeMode">one of <c>#WRITE_BLOCKING</c>, <c>#WRITE_NON_BLOCKING</c>.
                 &lt;BR&gt;With <c>#WRITE_BLOCKING</c>, the write will block until all data has been written
                     to the audio sink.
diff --git a/docs/Mono.Android/en/Android.Media/MediaDescription+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Media/MediaDescription+InterfaceConsts.xml
index 4596674808..509f8d5e4b 100644
--- a/docs/Mono.Android/en/Android.Media/MediaDescription+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Media/MediaDescription+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Media/MediaExtractor.xml b/docs/Mono.Android/en/Android.Media/MediaExtractor.xml
index 37bc82893f..5af7f85b83 100644
--- a/docs/Mono.Android/en/Android.Media/MediaExtractor.xml
+++ b/docs/Mono.Android/en/Android.Media/MediaExtractor.xml
@@ -1305,14 +1305,14 @@
       <Docs>
         <param name="path">the path of the file, or the http URL of the stream
             
-            &lt;p&gt;When &lt;code&gt;path&lt;/code&gt; refers to a local file, the file may actually be opened by a
+            &lt;p&gt;When <c>path</c> refers to a local file, the file may actually be opened by a
             process other than the calling application.  This implies that the pathname
             should be an absolute path (as any other process runs with unspecified current working
             directory), and that the pathname should reference a world-readable file.
             As an alternative, the application could first open the file for reading,
             and then use the file descriptor form <c>#setDataSource(FileDescriptor)</c>.
             
-            &lt;p&gt;When &lt;code&gt;path&lt;/code&gt; refers to a network file the
+            &lt;p&gt;When <c>path</c> refers to a network file the
             <c>android.Manifest.permission#INTERNET</c> permission is required.</param>
         <summary>Sets the data source (file-path or http URL) to use.</summary>
         <remarks>
@@ -1357,7 +1357,7 @@
       <Docs>
         <param name="path">the path of the file, or the http URL
             
-            &lt;p&gt;When &lt;code&gt;path&lt;/code&gt; refers to a network file the
+            &lt;p&gt;When <c>path</c> refers to a network file the
             <c>android.Manifest.permission#INTERNET</c> permission is required.</param>
         <param name="headers">the headers associated with the http request for the stream you want to play.
                    This can be <c>null</c> if no specific headers are to be sent with the
@@ -1405,7 +1405,7 @@
         <param name="context">the Context to use when resolving the Uri</param>
         <param name="uri">the Content URI of the data you want to extract from.
             
-            &lt;p&gt;When &lt;code&gt;uri&lt;/code&gt; refers to a network file the
+            &lt;p&gt;When <c>uri</c> refers to a network file the
             <c>android.Manifest.permission#INTERNET</c> permission is required.</param>
         <param name="headers">the headers to be sent together with the request for the data.
                    This can be <c>null</c> if no specific headers are to be sent with the
diff --git a/docs/Mono.Android/en/Android.Media/MediaMetadata+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Media/MediaMetadata+InterfaceConsts.xml
index a3ac135c8a..75509ad683 100644
--- a/docs/Mono.Android/en/Android.Media/MediaMetadata+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Media/MediaMetadata+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Media/MediaPlayer+IOnErrorListener.xml b/docs/Mono.Android/en/Android.Media/MediaPlayer+IOnErrorListener.xml
index 3311cfb8e6..c5a627990a 100644
--- a/docs/Mono.Android/en/Android.Media/MediaPlayer+IOnErrorListener.xml
+++ b/docs/Mono.Android/en/Android.Media/MediaPlayer+IOnErrorListener.xml
@@ -82,7 +82,7 @@
         <param name="extra">an extra code, specific to the error. Typically
             implementation dependent.
             &lt;ul&gt;
-            &lt;li&gt;<c>#MEDIA_ERROR_IO</c>&lt;li&gt;<c>#MEDIA_ERROR_MALFORMED</c>&lt;li&gt;<c>#MEDIA_ERROR_UNSUPPORTED</c>&lt;li&gt;<c>#MEDIA_ERROR_TIMED_OUT</c>&lt;li&gt;&lt;code&gt;MEDIA_ERROR_SYSTEM (-2147483648)&lt;/code&gt; - low-level system error.
+            &lt;li&gt;<c>#MEDIA_ERROR_IO</c>&lt;li&gt;<c>#MEDIA_ERROR_MALFORMED</c>&lt;li&gt;<c>#MEDIA_ERROR_UNSUPPORTED</c>&lt;li&gt;<c>#MEDIA_ERROR_TIMED_OUT</c>&lt;li&gt;<c>MEDIA_ERROR_SYSTEM (-2147483648)</c> - low-level system error.
             &lt;/ul&gt;</param>
         <summary>Called to indicate an error.</summary>
         <returns>True if the method handled the error, false if it didn't.
diff --git a/docs/Mono.Android/en/Android.Media/MediaPlayer+IOnInfoListener.xml b/docs/Mono.Android/en/Android.Media/MediaPlayer+IOnInfoListener.xml
index bedafbc79b..3fa46f2384 100644
--- a/docs/Mono.Android/en/Android.Media/MediaPlayer+IOnInfoListener.xml
+++ b/docs/Mono.Android/en/Android.Media/MediaPlayer+IOnInfoListener.xml
@@ -77,8 +77,8 @@
         <param name="mp">the MediaPlayer the info pertains to.</param>
         <param name="what">the type of info or warning.
             &lt;ul&gt;
-            &lt;li&gt;<c>#MEDIA_INFO_UNKNOWN</c>&lt;li&gt;<c>#MEDIA_INFO_VIDEO_TRACK_LAGGING</c>&lt;li&gt;<c>#MEDIA_INFO_VIDEO_RENDERING_START</c>&lt;li&gt;<c>#MEDIA_INFO_BUFFERING_START</c>&lt;li&gt;<c>#MEDIA_INFO_BUFFERING_END</c>&lt;li&gt;&lt;code&gt;MEDIA_INFO_NETWORK_BANDWIDTH (703)&lt;/code&gt; -
-                bandwidth information is available (as &lt;code&gt;extra&lt;/code&gt; kbps)
+            &lt;li&gt;<c>#MEDIA_INFO_UNKNOWN</c>&lt;li&gt;<c>#MEDIA_INFO_VIDEO_TRACK_LAGGING</c>&lt;li&gt;<c>#MEDIA_INFO_VIDEO_RENDERING_START</c>&lt;li&gt;<c>#MEDIA_INFO_BUFFERING_START</c>&lt;li&gt;<c>#MEDIA_INFO_BUFFERING_END</c>&lt;li&gt;<c>MEDIA_INFO_NETWORK_BANDWIDTH (703)</c> -
+                bandwidth information is available (as <c>extra</c> kbps)
             &lt;li&gt;<c>#MEDIA_INFO_BAD_INTERLEAVING</c>&lt;li&gt;<c>#MEDIA_INFO_NOT_SEEKABLE</c>&lt;li&gt;<c>#MEDIA_INFO_METADATA_UPDATE</c>&lt;li&gt;<c>#MEDIA_INFO_UNSUPPORTED_SUBTITLE</c>&lt;li&gt;<c>#MEDIA_INFO_SUBTITLE_TIMED_OUT</c>&lt;/ul&gt;</param>
         <param name="extra">an extra code, specific to the info. Typically
             implementation dependent.</param>
diff --git a/docs/Mono.Android/en/Android.Media/MediaPlayer+TrackInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Media/MediaPlayer+TrackInfo+InterfaceConsts.xml
index 96b03f761d..4e80228293 100644
--- a/docs/Mono.Android/en/Android.Media/MediaPlayer+TrackInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Media/MediaPlayer+TrackInfo+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Media/MediaPlayer.xml b/docs/Mono.Android/en/Android.Media/MediaPlayer.xml
index 243d876444..d2d6331c6f 100644
--- a/docs/Mono.Android/en/Android.Media/MediaPlayer.xml
+++ b/docs/Mono.Android/en/Android.Media/MediaPlayer.xml
@@ -415,7 +415,7 @@
             When created, a MediaPlayer instance automatically generates its own audio session ID.
             However, it is possible to force this player to be part of an already existing audio session
             by calling this method.
-            This method must be called before one of the overloaded &lt;code&gt; setDataSource &lt;/code&gt; methods.</param>
+            This method must be called before one of the overloaded <c> setDataSource </c> methods.</param>
         <summary>Returns the audio session ID. -or- Sets the audio session ID.</summary>
         <value>the audio session ID. <c>#setAudioSessionId(int)</c>
             Note that the audio session ID is 0 only if a problem occured when the MediaPlayer was contructed.</value>
diff --git a/docs/Mono.Android/en/Android.Media/MediaRoute2Info+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Media/MediaRoute2Info+InterfaceConsts.xml
index d7cb6de5c9..67fd7e646f 100644
--- a/docs/Mono.Android/en/Android.Media/MediaRoute2Info+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Media/MediaRoute2Info+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Media/MediaSyncEvent+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Media/MediaSyncEvent+InterfaceConsts.xml
index 3f3a19c28e..350606a467 100644
--- a/docs/Mono.Android/en/Android.Media/MediaSyncEvent+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Media/MediaSyncEvent+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Media/PlaybackParams+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Media/PlaybackParams+InterfaceConsts.xml
index 985efd2597..11cc282210 100644
--- a/docs/Mono.Android/en/Android.Media/PlaybackParams+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Media/PlaybackParams+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Media/PlaybackParams.xml b/docs/Mono.Android/en/Android.Media/PlaybackParams.xml
index 8fefd78549..0bd066d867 100644
--- a/docs/Mono.Android/en/Android.Media/PlaybackParams.xml
+++ b/docs/Mono.Android/en/Android.Media/PlaybackParams.xml
@@ -91,7 +91,7 @@
       <Parameters />
       <Docs>
         <summary>Allows defaults to be returned for properties not set.</summary>
-        <returns>this &lt;code&gt;PlaybackParams&lt;/code&gt; instance.</returns>
+        <returns>this <c>PlaybackParams</c> instance.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -302,7 +302,7 @@
       <Docs>
         <param name="audioFallbackMode">audioFallbackMode</param>
         <summary>Sets the audio fallback mode.</summary>
-        <returns>this &lt;code&gt;PlaybackParams&lt;/code&gt; instance.</returns>
+        <returns>this <c>PlaybackParams</c> instance.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -342,7 +342,7 @@
       <Docs>
         <param name="pitch">pitch</param>
         <summary>Sets the pitch factor.</summary>
-        <returns>this &lt;code&gt;PlaybackParams&lt;/code&gt; instance.</returns>
+        <returns>this <c>PlaybackParams</c> instance.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -382,7 +382,7 @@
       <Docs>
         <param name="speed">speed</param>
         <summary>Sets the speed factor.</summary>
-        <returns>this &lt;code&gt;PlaybackParams&lt;/code&gt; instance.</returns>
+        <returns>this <c>PlaybackParams</c> instance.</returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Media/Rating+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Media/Rating+InterfaceConsts.xml
index bc850e6578..7b208799b5 100644
--- a/docs/Mono.Android/en/Android.Media/Rating+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Media/Rating+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Media/RouteDiscoveryPreference+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Media/RouteDiscoveryPreference+InterfaceConsts.xml
index 58234e5b74..064ad2d396 100644
--- a/docs/Mono.Android/en/Android.Media/RouteDiscoveryPreference+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Media/RouteDiscoveryPreference+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Media/RoutingSessionInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Media/RoutingSessionInfo+InterfaceConsts.xml
index 264841707d..84ec5d1b42 100644
--- a/docs/Mono.Android/en/Android.Media/RoutingSessionInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Media/RoutingSessionInfo+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Media/Session2Command+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Media/Session2Command+InterfaceConsts.xml
index 251f1a9c78..0ee2114cb2 100644
--- a/docs/Mono.Android/en/Android.Media/Session2Command+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Media/Session2Command+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Media/Session2CommandGroup+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Media/Session2CommandGroup+InterfaceConsts.xml
index 3022d24123..3d53012a56 100644
--- a/docs/Mono.Android/en/Android.Media/Session2CommandGroup+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Media/Session2CommandGroup+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Media/Session2Token+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Media/Session2Token+InterfaceConsts.xml
index 3b049359e2..02dc8f3bcd 100644
--- a/docs/Mono.Android/en/Android.Media/Session2Token+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Media/Session2Token+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Media/SyncParams.xml b/docs/Mono.Android/en/Android.Media/SyncParams.xml
index ef51630b4a..e8a44f4789 100644
--- a/docs/Mono.Android/en/Android.Media/SyncParams.xml
+++ b/docs/Mono.Android/en/Android.Media/SyncParams.xml
@@ -78,7 +78,7 @@
       <Parameters />
       <Docs>
         <summary>Allows defaults to be returned for properties not set.</summary>
-        <returns>this &lt;code&gt;SyncParams&lt;/code&gt; instance.</returns>
+        <returns>this <c>SyncParams</c> instance.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -231,7 +231,7 @@
       <Docs>
         <param name="audioAdjustMode">audioAdjustMode</param>
         <summary>Sets the audio adjust mode.</summary>
-        <returns>this &lt;code&gt;SyncParams&lt;/code&gt; instance.</returns>
+        <returns>this <c>SyncParams</c> instance.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -273,7 +273,7 @@
                 the video frame rate to be used when using vsync as the sync source. A negative
                 number is used to clear a previous hint.</param>
         <summary>Sets the video frame rate hint to be used.</summary>
-        <returns>this &lt;code&gt;SyncParams&lt;/code&gt; instance.</returns>
+        <returns>this <c>SyncParams</c> instance.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -320,7 +320,7 @@
       <Docs>
         <param name="syncSource">syncSource</param>
         <summary>Sets the sync source.</summary>
-        <returns>this &lt;code&gt;SyncParams&lt;/code&gt; instance.</returns>
+        <returns>this <c>SyncParams</c> instance.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -362,7 +362,7 @@
                 the maximum deviation of the playback rate from the playback rate
                 set. (<c>abs(actual_rate - set_rate) / set_rate</c>)</param>
         <summary>Sets the tolerance.</summary>
-        <returns>this &lt;code&gt;SyncParams&lt;/code&gt; instance.</returns>
+        <returns>this <c>SyncParams</c> instance.</returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Media/VolumeShaper+Configuration+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Media/VolumeShaper+Configuration+InterfaceConsts.xml
index 3251f23d0b..315b1862fe 100644
--- a/docs/Mono.Android/en/Android.Media/VolumeShaper+Configuration+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Media/VolumeShaper+Configuration+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Media/VolumeShaper+Operation+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Media/VolumeShaper+Operation+InterfaceConsts.xml
index 0d78067cf6..ea6187f874 100644
--- a/docs/Mono.Android/en/Android.Media/VolumeShaper+Operation+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Media/VolumeShaper+Operation+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Net.Nsd/NsdServiceInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Net.Nsd/NsdServiceInfo+InterfaceConsts.xml
index 3fa2430dc1..07ab76ae41 100644
--- a/docs/Mono.Android/en/Android.Net.Nsd/NsdServiceInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Net.Nsd/NsdServiceInfo+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Net.Sip/SipProfile+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Net.Sip/SipProfile+InterfaceConsts.xml
index 9ae2dccc05..9fa7adbafe 100644
--- a/docs/Mono.Android/en/Android.Net.Sip/SipProfile+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Net.Sip/SipProfile+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Net.Vcn/VcnConfig+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Net.Vcn/VcnConfig+InterfaceConsts.xml
index aef953f7ae..6286d54e16 100644
--- a/docs/Mono.Android/en/Android.Net.Vcn/VcnConfig+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Net.Vcn/VcnConfig+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Net.Wifi.Aware/AwareResources+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Net.Wifi.Aware/AwareResources+InterfaceConsts.xml
index 535b5dcd8c..714339324a 100644
--- a/docs/Mono.Android/en/Android.Net.Wifi.Aware/AwareResources+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Net.Wifi.Aware/AwareResources+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Net.Wifi.Aware/Characteristics+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Net.Wifi.Aware/Characteristics+InterfaceConsts.xml
index 22941ede4d..09ff58e41c 100644
--- a/docs/Mono.Android/en/Android.Net.Wifi.Aware/Characteristics+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Net.Wifi.Aware/Characteristics+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Net.Wifi.Aware/ParcelablePeerHandle+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Net.Wifi.Aware/ParcelablePeerHandle+InterfaceConsts.xml
index fab893c667..9a48f73200 100644
--- a/docs/Mono.Android/en/Android.Net.Wifi.Aware/ParcelablePeerHandle+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Net.Wifi.Aware/ParcelablePeerHandle+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Net.Wifi.Aware/PublishConfig+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Net.Wifi.Aware/PublishConfig+InterfaceConsts.xml
index 0a957f8b06..303b34de8f 100644
--- a/docs/Mono.Android/en/Android.Net.Wifi.Aware/PublishConfig+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Net.Wifi.Aware/PublishConfig+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Net.Wifi.Aware/SubscribeConfig+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Net.Wifi.Aware/SubscribeConfig+InterfaceConsts.xml
index a19426e0ed..b2709f8bc6 100644
--- a/docs/Mono.Android/en/Android.Net.Wifi.Aware/SubscribeConfig+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Net.Wifi.Aware/SubscribeConfig+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Net.Wifi.Aware/WifiAwareNetworkInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Net.Wifi.Aware/WifiAwareNetworkInfo+InterfaceConsts.xml
index e8b5365548..293655e451 100644
--- a/docs/Mono.Android/en/Android.Net.Wifi.Aware/WifiAwareNetworkInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Net.Wifi.Aware/WifiAwareNetworkInfo+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Net.Wifi.Aware/WifiAwareNetworkSpecifier+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Net.Wifi.Aware/WifiAwareNetworkSpecifier+InterfaceConsts.xml
index 72b9b9052e..966dac9336 100644
--- a/docs/Mono.Android/en/Android.Net.Wifi.Aware/WifiAwareNetworkSpecifier+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Net.Wifi.Aware/WifiAwareNetworkSpecifier+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Net.Wifi.Hotspot2.Pps/Credential+CertificateCredential+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Net.Wifi.Hotspot2.Pps/Credential+CertificateCredential+InterfaceConsts.xml
index 9dc3cfdd2a..83b54784c0 100644
--- a/docs/Mono.Android/en/Android.Net.Wifi.Hotspot2.Pps/Credential+CertificateCredential+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Net.Wifi.Hotspot2.Pps/Credential+CertificateCredential+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Net.Wifi.Hotspot2.Pps/Credential+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Net.Wifi.Hotspot2.Pps/Credential+InterfaceConsts.xml
index 10e6c67716..c65e6c2f3f 100644
--- a/docs/Mono.Android/en/Android.Net.Wifi.Hotspot2.Pps/Credential+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Net.Wifi.Hotspot2.Pps/Credential+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Net.Wifi.Hotspot2.Pps/Credential+SimCredential+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Net.Wifi.Hotspot2.Pps/Credential+SimCredential+InterfaceConsts.xml
index d69f474958..93880b7189 100644
--- a/docs/Mono.Android/en/Android.Net.Wifi.Hotspot2.Pps/Credential+SimCredential+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Net.Wifi.Hotspot2.Pps/Credential+SimCredential+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Net.Wifi.Hotspot2.Pps/Credential+UserCredential+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Net.Wifi.Hotspot2.Pps/Credential+UserCredential+InterfaceConsts.xml
index 438765c0f3..56f1135280 100644
--- a/docs/Mono.Android/en/Android.Net.Wifi.Hotspot2.Pps/Credential+UserCredential+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Net.Wifi.Hotspot2.Pps/Credential+UserCredential+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Net.Wifi.Hotspot2.Pps/HomeSp+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Net.Wifi.Hotspot2.Pps/HomeSp+InterfaceConsts.xml
index 1479addfd3..6e89eab50b 100644
--- a/docs/Mono.Android/en/Android.Net.Wifi.Hotspot2.Pps/HomeSp+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Net.Wifi.Hotspot2.Pps/HomeSp+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Net.Wifi.Hotspot2/PasspointConfiguration+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Net.Wifi.Hotspot2/PasspointConfiguration+InterfaceConsts.xml
index 5ff119d272..0af0ecc85f 100644
--- a/docs/Mono.Android/en/Android.Net.Wifi.Hotspot2/PasspointConfiguration+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Net.Wifi.Hotspot2/PasspointConfiguration+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Net.Wifi.P2p.Nsd/WifiP2pServiceInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Net.Wifi.P2p.Nsd/WifiP2pServiceInfo+InterfaceConsts.xml
index 589d212fde..098ae634a1 100644
--- a/docs/Mono.Android/en/Android.Net.Wifi.P2p.Nsd/WifiP2pServiceInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Net.Wifi.P2p.Nsd/WifiP2pServiceInfo+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Net.Wifi.P2p.Nsd/WifiP2pServiceRequest+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Net.Wifi.P2p.Nsd/WifiP2pServiceRequest+InterfaceConsts.xml
index 3c45129224..86af4a0743 100644
--- a/docs/Mono.Android/en/Android.Net.Wifi.P2p.Nsd/WifiP2pServiceRequest+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Net.Wifi.P2p.Nsd/WifiP2pServiceRequest+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Net.Wifi.P2p/WifiP2pConfig+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Net.Wifi.P2p/WifiP2pConfig+InterfaceConsts.xml
index 3a07f7755f..2abc89ed5c 100644
--- a/docs/Mono.Android/en/Android.Net.Wifi.P2p/WifiP2pConfig+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Net.Wifi.P2p/WifiP2pConfig+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Net.Wifi.P2p/WifiP2pDevice+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Net.Wifi.P2p/WifiP2pDevice+InterfaceConsts.xml
index 1359c566bf..183362d475 100644
--- a/docs/Mono.Android/en/Android.Net.Wifi.P2p/WifiP2pDevice+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Net.Wifi.P2p/WifiP2pDevice+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Net.Wifi.P2p/WifiP2pDeviceList+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Net.Wifi.P2p/WifiP2pDeviceList+InterfaceConsts.xml
index 4239184f1c..83297cae10 100644
--- a/docs/Mono.Android/en/Android.Net.Wifi.P2p/WifiP2pDeviceList+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Net.Wifi.P2p/WifiP2pDeviceList+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Net.Wifi.P2p/WifiP2pGroup+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Net.Wifi.P2p/WifiP2pGroup+InterfaceConsts.xml
index a25ae4a681..0d559c5124 100644
--- a/docs/Mono.Android/en/Android.Net.Wifi.P2p/WifiP2pGroup+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Net.Wifi.P2p/WifiP2pGroup+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Net.Wifi.P2p/WifiP2pInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Net.Wifi.P2p/WifiP2pInfo+InterfaceConsts.xml
index c3f5f2496f..b81e9b31b6 100644
--- a/docs/Mono.Android/en/Android.Net.Wifi.P2p/WifiP2pInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Net.Wifi.P2p/WifiP2pInfo+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Net.Wifi.P2p/WifiP2pWfdInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Net.Wifi.P2p/WifiP2pWfdInfo+InterfaceConsts.xml
index b576d777c7..dfbec6550b 100644
--- a/docs/Mono.Android/en/Android.Net.Wifi.P2p/WifiP2pWfdInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Net.Wifi.P2p/WifiP2pWfdInfo+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Net.Wifi.Rtt/RangingRequest+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Net.Wifi.Rtt/RangingRequest+InterfaceConsts.xml
index 85168df46e..4dd8b3dc01 100644
--- a/docs/Mono.Android/en/Android.Net.Wifi.Rtt/RangingRequest+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Net.Wifi.Rtt/RangingRequest+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Net.Wifi.Rtt/RangingResult+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Net.Wifi.Rtt/RangingResult+InterfaceConsts.xml
index 92dbcf1a26..9b313e2e49 100644
--- a/docs/Mono.Android/en/Android.Net.Wifi.Rtt/RangingResult+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Net.Wifi.Rtt/RangingResult+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Net.Wifi.Rtt/ResponderLocation+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Net.Wifi.Rtt/ResponderLocation+InterfaceConsts.xml
index 7209b46824..d8b533608d 100644
--- a/docs/Mono.Android/en/Android.Net.Wifi.Rtt/ResponderLocation+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Net.Wifi.Rtt/ResponderLocation+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Net.Wifi/ScanResult+InformationElement+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Net.Wifi/ScanResult+InformationElement+InterfaceConsts.xml
index 33d3864ea0..47de35fe80 100644
--- a/docs/Mono.Android/en/Android.Net.Wifi/ScanResult+InformationElement+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Net.Wifi/ScanResult+InformationElement+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Net.Wifi/ScanResult+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Net.Wifi/ScanResult+InterfaceConsts.xml
index 9cd3a6fc64..55f8116adf 100644
--- a/docs/Mono.Android/en/Android.Net.Wifi/ScanResult+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Net.Wifi/ScanResult+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Net.Wifi/SoftApConfiguration+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Net.Wifi/SoftApConfiguration+InterfaceConsts.xml
index db6542d62c..1fd9c1af8a 100644
--- a/docs/Mono.Android/en/Android.Net.Wifi/SoftApConfiguration+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Net.Wifi/SoftApConfiguration+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Net.Wifi/SupplicantState+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Net.Wifi/SupplicantState+InterfaceConsts.xml
index 869680170c..cdaf8451f4 100644
--- a/docs/Mono.Android/en/Android.Net.Wifi/SupplicantState+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Net.Wifi/SupplicantState+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Net.Wifi/WifiConfiguration+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Net.Wifi/WifiConfiguration+InterfaceConsts.xml
index cb1c945a41..294d3d62fb 100644
--- a/docs/Mono.Android/en/Android.Net.Wifi/WifiConfiguration+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Net.Wifi/WifiConfiguration+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Net.Wifi/WifiEnterpriseConfig+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Net.Wifi/WifiEnterpriseConfig+InterfaceConsts.xml
index f8efba8f72..614c132ff1 100644
--- a/docs/Mono.Android/en/Android.Net.Wifi/WifiEnterpriseConfig+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Net.Wifi/WifiEnterpriseConfig+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Net.Wifi/WifiInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Net.Wifi/WifiInfo+InterfaceConsts.xml
index b3a3872f5a..65e6ac49b6 100644
--- a/docs/Mono.Android/en/Android.Net.Wifi/WifiInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Net.Wifi/WifiInfo+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Net.Wifi/WifiManager+AddNetworkResult+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Net.Wifi/WifiManager+AddNetworkResult+InterfaceConsts.xml
index 3d1f51322b..7a1133c593 100644
--- a/docs/Mono.Android/en/Android.Net.Wifi/WifiManager+AddNetworkResult+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Net.Wifi/WifiManager+AddNetworkResult+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Net.Wifi/WifiNetworkSpecifier+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Net.Wifi/WifiNetworkSpecifier+InterfaceConsts.xml
index 7b186d6399..def080fdea 100644
--- a/docs/Mono.Android/en/Android.Net.Wifi/WifiNetworkSpecifier+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Net.Wifi/WifiNetworkSpecifier+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Net.Wifi/WifiNetworkSuggestion+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Net.Wifi/WifiNetworkSuggestion+InterfaceConsts.xml
index f234875eac..ec7708e182 100644
--- a/docs/Mono.Android/en/Android.Net.Wifi/WifiNetworkSuggestion+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Net.Wifi/WifiNetworkSuggestion+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Net.Wifi/WpsInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Net.Wifi/WpsInfo+InterfaceConsts.xml
index 333aef36ae..e273a83066 100644
--- a/docs/Mono.Android/en/Android.Net.Wifi/WpsInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Net.Wifi/WpsInfo+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Net/CaptivePortal+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Net/CaptivePortal+InterfaceConsts.xml
index 567c7cc549..524002490b 100644
--- a/docs/Mono.Android/en/Android.Net/CaptivePortal+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Net/CaptivePortal+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Net/ConnectivityDiagnosticsManager+ConnectivityReport+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Net/ConnectivityDiagnosticsManager+ConnectivityReport+InterfaceConsts.xml
index a6eb547245..d5fd14a8f6 100644
--- a/docs/Mono.Android/en/Android.Net/ConnectivityDiagnosticsManager+ConnectivityReport+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Net/ConnectivityDiagnosticsManager+ConnectivityReport+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Net/ConnectivityDiagnosticsManager+DataStallReport+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Net/ConnectivityDiagnosticsManager+DataStallReport+InterfaceConsts.xml
index 382a17c2e0..5911fddee1 100644
--- a/docs/Mono.Android/en/Android.Net/ConnectivityDiagnosticsManager+DataStallReport+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Net/ConnectivityDiagnosticsManager+DataStallReport+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Net/DhcpInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Net/DhcpInfo+InterfaceConsts.xml
index e0f1143598..8612c7df9f 100644
--- a/docs/Mono.Android/en/Android.Net/DhcpInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Net/DhcpInfo+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Net/IpPrefix+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Net/IpPrefix+InterfaceConsts.xml
index 880968eec8..144fd2fb5c 100644
--- a/docs/Mono.Android/en/Android.Net/IpPrefix+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Net/IpPrefix+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Net/IpSecAlgorithm+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Net/IpSecAlgorithm+InterfaceConsts.xml
index d752f0e60d..8d8fcfa788 100644
--- a/docs/Mono.Android/en/Android.Net/IpSecAlgorithm+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Net/IpSecAlgorithm+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Net/LinkAddress+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Net/LinkAddress+InterfaceConsts.xml
index 429da7bfd8..d0c117ae90 100644
--- a/docs/Mono.Android/en/Android.Net/LinkAddress+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Net/LinkAddress+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Net/LinkProperties+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Net/LinkProperties+InterfaceConsts.xml
index 2a622022bc..f1fddf55e1 100644
--- a/docs/Mono.Android/en/Android.Net/LinkProperties+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Net/LinkProperties+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Net/MacAddress+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Net/MacAddress+InterfaceConsts.xml
index e987a7189b..169018a273 100644
--- a/docs/Mono.Android/en/Android.Net/MacAddress+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Net/MacAddress+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Net/Network+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Net/Network+InterfaceConsts.xml
index 206161448f..552d0b98f5 100644
--- a/docs/Mono.Android/en/Android.Net/Network+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Net/Network+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Net/NetworkCapabilities+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Net/NetworkCapabilities+InterfaceConsts.xml
index d5497f9c79..b73bc28d62 100644
--- a/docs/Mono.Android/en/Android.Net/NetworkCapabilities+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Net/NetworkCapabilities+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Net/NetworkInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Net/NetworkInfo+InterfaceConsts.xml
index e22a981eef..36578093a5 100644
--- a/docs/Mono.Android/en/Android.Net/NetworkInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Net/NetworkInfo+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Net/NetworkRequest+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Net/NetworkRequest+InterfaceConsts.xml
index ac7ec39c09..6aeebfd448 100644
--- a/docs/Mono.Android/en/Android.Net/NetworkRequest+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Net/NetworkRequest+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Net/ProxyInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Net/ProxyInfo+InterfaceConsts.xml
index cee2a1195d..1b1e101065 100644
--- a/docs/Mono.Android/en/Android.Net/ProxyInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Net/ProxyInfo+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Net/RouteInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Net/RouteInfo+InterfaceConsts.xml
index a9420178b3..076d1c65ca 100644
--- a/docs/Mono.Android/en/Android.Net/RouteInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Net/RouteInfo+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Net/TelephonyNetworkSpecifier+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Net/TelephonyNetworkSpecifier+InterfaceConsts.xml
index e3168b6114..6f42d34ebf 100644
--- a/docs/Mono.Android/en/Android.Net/TelephonyNetworkSpecifier+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Net/TelephonyNetworkSpecifier+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Net/Uri+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Net/Uri+InterfaceConsts.xml
index 8db0333cad..6cf3f63b95 100644
--- a/docs/Mono.Android/en/Android.Net/Uri+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Net/Uri+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Nfc/NdefMessage+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Nfc/NdefMessage+InterfaceConsts.xml
index 3824a1d4b1..0413186962 100644
--- a/docs/Mono.Android/en/Android.Nfc/NdefMessage+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Nfc/NdefMessage+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Nfc/NdefRecord+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Nfc/NdefRecord+InterfaceConsts.xml
index 37c34a70e3..de0640b4b8 100644
--- a/docs/Mono.Android/en/Android.Nfc/NdefRecord+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Nfc/NdefRecord+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Nfc/Tag+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Nfc/Tag+InterfaceConsts.xml
index bda83ba9a1..ae900d82ac 100644
--- a/docs/Mono.Android/en/Android.Nfc/Tag+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Nfc/Tag+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.OS.Health/TimerStat+InterfaceConsts.xml b/docs/Mono.Android/en/Android.OS.Health/TimerStat+InterfaceConsts.xml
index c2f5755d1a..93818f6d9e 100644
--- a/docs/Mono.Android/en/Android.OS.Health/TimerStat+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.OS.Health/TimerStat+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.OS.Storage/StorageManager.xml b/docs/Mono.Android/en/Android.OS.Storage/StorageManager.xml
index d1154e9762..c63b66fc05 100644
--- a/docs/Mono.Android/en/Android.OS.Storage/StorageManager.xml
+++ b/docs/Mono.Android/en/Android.OS.Storage/StorageManager.xml
@@ -526,7 +526,7 @@
       <Docs>
         <param name="rawPath">path to OBB image</param>
         <summary>Check the mounted path of an Opaque Binary Blob (OBB) file.</summary>
-        <returns>absolute path to mounted OBB image data or &lt;code&gt;null&lt;/code&gt; if
+        <returns>absolute path to mounted OBB image data or <c>null</c> if
                     not mounted or exception encountered trying to read status</returns>
         <remarks>
           <para>
@@ -964,7 +964,7 @@
       </Parameters>
       <Docs>
         <param name="rawPath">the path to the OBB file</param>
-        <param name="key">secret used to encrypt the OBB; may be &lt;code&gt;null&lt;/code&gt; if no
+        <param name="key">secret used to encrypt the OBB; may be <c>null</c> if no
                        encryption was used on the OBB.</param>
         <param name="listener">will receive the success or failure of the operation</param>
         <summary>Mount an Opaque Binary Blob (OBB) file.</summary>
diff --git a/docs/Mono.Android/en/Android.OS.Storage/StorageVolume+InterfaceConsts.xml b/docs/Mono.Android/en/Android.OS.Storage/StorageVolume+InterfaceConsts.xml
index 85aecedfa3..34bab28775 100644
--- a/docs/Mono.Android/en/Android.OS.Storage/StorageVolume+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.OS.Storage/StorageVolume+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.OS/Bundle+InterfaceConsts.xml b/docs/Mono.Android/en/Android.OS/Bundle+InterfaceConsts.xml
index 6805ebe762..e33c2b3900 100644
--- a/docs/Mono.Android/en/Android.OS/Bundle+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.OS/Bundle+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.OS/CombinedVibration+InterfaceConsts.xml b/docs/Mono.Android/en/Android.OS/CombinedVibration+InterfaceConsts.xml
index 998aab4d5a..92c7cfff9d 100644
--- a/docs/Mono.Android/en/Android.OS/CombinedVibration+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.OS/CombinedVibration+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.OS/CpuUsageInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.OS/CpuUsageInfo+InterfaceConsts.xml
index 723cd25464..47e356a219 100644
--- a/docs/Mono.Android/en/Android.OS/CpuUsageInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.OS/CpuUsageInfo+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.OS/Debug+MemoryInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.OS/Debug+MemoryInfo+InterfaceConsts.xml
index 84a75e343b..be89ea3faa 100644
--- a/docs/Mono.Android/en/Android.OS/Debug+MemoryInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.OS/Debug+MemoryInfo+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.OS/DropBoxManager+Entry+InterfaceConsts.xml b/docs/Mono.Android/en/Android.OS/DropBoxManager+Entry+InterfaceConsts.xml
index 7070be3ae9..11aad0ebd9 100644
--- a/docs/Mono.Android/en/Android.OS/DropBoxManager+Entry+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.OS/DropBoxManager+Entry+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.OS/LocaleList+InterfaceConsts.xml b/docs/Mono.Android/en/Android.OS/LocaleList+InterfaceConsts.xml
index bf2f853eb9..d075474c5d 100644
--- a/docs/Mono.Android/en/Android.OS/LocaleList+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.OS/LocaleList+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.OS/Message+InterfaceConsts.xml b/docs/Mono.Android/en/Android.OS/Message+InterfaceConsts.xml
index ce5e7cf888..bb5b386252 100644
--- a/docs/Mono.Android/en/Android.OS/Message+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.OS/Message+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.OS/Messenger+InterfaceConsts.xml b/docs/Mono.Android/en/Android.OS/Messenger+InterfaceConsts.xml
index 86d759838b..834e98c329 100644
--- a/docs/Mono.Android/en/Android.OS/Messenger+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.OS/Messenger+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.OS/ParcelFileDescriptor+InterfaceConsts.xml b/docs/Mono.Android/en/Android.OS/ParcelFileDescriptor+InterfaceConsts.xml
index 57ee8f6f1a..fea430e019 100644
--- a/docs/Mono.Android/en/Android.OS/ParcelFileDescriptor+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.OS/ParcelFileDescriptor+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.OS/ParcelUuid+InterfaceConsts.xml b/docs/Mono.Android/en/Android.OS/ParcelUuid+InterfaceConsts.xml
index 9751d2c764..d802ec2bfa 100644
--- a/docs/Mono.Android/en/Android.OS/ParcelUuid+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.OS/ParcelUuid+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.OS/Parcelable.xml b/docs/Mono.Android/en/Android.OS/Parcelable.xml
index c21bb9e246..84acab5a6f 100644
--- a/docs/Mono.Android/en/Android.OS/Parcelable.xml
+++ b/docs/Mono.Android/en/Android.OS/Parcelable.xml
@@ -104,9 +104,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.OS/PatternMatcher+InterfaceConsts.xml b/docs/Mono.Android/en/Android.OS/PatternMatcher+InterfaceConsts.xml
index ca94fdfdd4..88bed5c8ad 100644
--- a/docs/Mono.Android/en/Android.OS/PatternMatcher+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.OS/PatternMatcher+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.OS/PersistableBundle+InterfaceConsts.xml b/docs/Mono.Android/en/Android.OS/PersistableBundle+InterfaceConsts.xml
index e0e7a9a061..6865adf6b5 100644
--- a/docs/Mono.Android/en/Android.OS/PersistableBundle+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.OS/PersistableBundle+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.OS/ResultReceiver+InterfaceConsts.xml b/docs/Mono.Android/en/Android.OS/ResultReceiver+InterfaceConsts.xml
index 7240e24bf9..80dc105b9b 100644
--- a/docs/Mono.Android/en/Android.OS/ResultReceiver+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.OS/ResultReceiver+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.OS/SharedMemory+InterfaceConsts.xml b/docs/Mono.Android/en/Android.OS/SharedMemory+InterfaceConsts.xml
index a640408208..fbd8ffde9c 100644
--- a/docs/Mono.Android/en/Android.OS/SharedMemory+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.OS/SharedMemory+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.OS/TokenWatcher.xml b/docs/Mono.Android/en/Android.OS/TokenWatcher.xml
index ba4420380c..354ac7f7e4 100644
--- a/docs/Mono.Android/en/Android.OS/TokenWatcher.xml
+++ b/docs/Mono.Android/en/Android.OS/TokenWatcher.xml
@@ -58,7 +58,7 @@
         <param name="h">A handler to call <c>#acquired</c> and <c>#released</c>
             on.  If you don't care, just call it like this, although your thread
             will have to be a Looper thread.
-            &lt;code&gt;new TokenWatcher(new Handler())&lt;/code&gt;</param>
+            <c>new TokenWatcher(new Handler())</c></param>
         <param name="tag">A debugging tag for this TokenWatcher</param>
         <summary>Construct the TokenWatcher</summary>
         <remarks>
diff --git a/docs/Mono.Android/en/Android.OS/UserHandle+InterfaceConsts.xml b/docs/Mono.Android/en/Android.OS/UserHandle+InterfaceConsts.xml
index 61f0ef628b..db45627196 100644
--- a/docs/Mono.Android/en/Android.OS/UserHandle+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.OS/UserHandle+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.OS/UserManager.xml b/docs/Mono.Android/en/Android.OS/UserManager.xml
index 0c5756980f..6c2f4490d6 100644
--- a/docs/Mono.Android/en/Android.OS/UserManager.xml
+++ b/docs/Mono.Android/en/Android.OS/UserManager.xml
@@ -2384,7 +2384,7 @@
       </Parameters>
       <Docs>
         <param name="userHandle">the UserHandle of the user for whom to retrieve the restrictions.</param>
-        <summary>Returns the user-wide restrictions imposed on the user specified by &lt;code&gt;userHandle&lt;/code&gt;.</summary>
+        <summary>Returns the user-wide restrictions imposed on the user specified by <c>userHandle</c>.</summary>
         <returns>a Bundle containing all the restrictions.
             
             &lt;p&gt;Requires <c>android.permission.MANAGE_USERS</c> or
diff --git a/docs/Mono.Android/en/Android.OS/VibrationAttributes+InterfaceConsts.xml b/docs/Mono.Android/en/Android.OS/VibrationAttributes+InterfaceConsts.xml
index c69fb424eb..ce62f5b895 100644
--- a/docs/Mono.Android/en/Android.OS/VibrationAttributes+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.OS/VibrationAttributes+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.OS/VibrationEffect+InterfaceConsts.xml b/docs/Mono.Android/en/Android.OS/VibrationEffect+InterfaceConsts.xml
index d21f17c04a..d60f74a843 100644
--- a/docs/Mono.Android/en/Android.OS/VibrationEffect+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.OS/VibrationEffect+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.OS/WorkSource+InterfaceConsts.xml b/docs/Mono.Android/en/Android.OS/WorkSource+InterfaceConsts.xml
index 46872764a3..094618679c 100644
--- a/docs/Mono.Android/en/Android.OS/WorkSource+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.OS/WorkSource+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Opengl/GLSurfaceView+IRenderer.xml b/docs/Mono.Android/en/Android.Opengl/GLSurfaceView+IRenderer.xml
index 6fa406c700..e1dee2b821 100644
--- a/docs/Mono.Android/en/Android.Opengl/GLSurfaceView+IRenderer.xml
+++ b/docs/Mono.Android/en/Android.Opengl/GLSurfaceView+IRenderer.xml
@@ -64,7 +64,7 @@
         <Parameter Name="gl" Type="Javax.Microedition.Khronos.Opengles.IGL10" />
       </Parameters>
       <Docs>
-        <param name="gl">the GL interface. Use &lt;code&gt;instanceof&lt;/code&gt; to
+        <param name="gl">the GL interface. Use <c>instanceof</c> to
             test if the interface supports GL11 or higher interfaces.</param>
         <summary>Called to draw the current frame.</summary>
         <remarks>
@@ -107,7 +107,7 @@
         <Parameter Name="height" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="gl">the GL interface. Use &lt;code&gt;instanceof&lt;/code&gt; to
+        <param name="gl">the GL interface. Use <c>instanceof</c> to
             test if the interface supports GL11 or higher interfaces.</param>
         <param name="width">width</param>
         <param name="height">height</param>
@@ -151,7 +151,7 @@
         <Parameter Name="config" Type="Javax.Microedition.Khronos.Egl.EGLConfig" />
       </Parameters>
       <Docs>
-        <param name="gl">the GL interface. Use &lt;code&gt;instanceof&lt;/code&gt; to
+        <param name="gl">the GL interface. Use <c>instanceof</c> to
             test if the interface supports GL11 or higher interfaces.</param>
         <param name="config">the EGLConfig of the created surface. Can be used
             to create matching pbuffers.</param>
diff --git a/docs/Mono.Android/en/Android.Preferences/PreferenceActivity+Header+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Preferences/PreferenceActivity+Header+InterfaceConsts.xml
index d88e81ee1b..dca7a7bac0 100644
--- a/docs/Mono.Android/en/Android.Preferences/PreferenceActivity+Header+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Preferences/PreferenceActivity+Header+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Print/PageRange+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Print/PageRange+InterfaceConsts.xml
index 58df61acb8..f321ab5056 100644
--- a/docs/Mono.Android/en/Android.Print/PageRange+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Print/PageRange+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Print/PrintAttributes+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Print/PrintAttributes+InterfaceConsts.xml
index 26298172e8..dc2b55e01d 100644
--- a/docs/Mono.Android/en/Android.Print/PrintAttributes+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Print/PrintAttributes+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Print/PrintDocumentAdapter+LayoutResultCallback.xml b/docs/Mono.Android/en/Android.Print/PrintDocumentAdapter+LayoutResultCallback.xml
index e396bb2ada..4f5e5ff023 100644
--- a/docs/Mono.Android/en/Android.Print/PrintDocumentAdapter+LayoutResultCallback.xml
+++ b/docs/Mono.Android/en/Android.Print/PrintDocumentAdapter+LayoutResultCallback.xml
@@ -148,7 +148,7 @@
       </Parameters>
       <Docs>
         <param name="error">The &lt;strong&gt;localized&lt;/strong&gt; error message.
-            shown to the user. May be &lt;code&gt;null&lt;/code&gt; if error is unknown.</param>
+            shown to the user. May be <c>null</c> if error is unknown.</param>
         <summary>Notifies that an error occurred while laying out the document.</summary>
         <remarks>
           <para>
@@ -182,7 +182,7 @@
       </Parameters>
       <Docs>
         <param name="error">The &lt;strong&gt;localized&lt;/strong&gt; error message.
-            shown to the user. May be &lt;code&gt;null&lt;/code&gt; if error is unknown.</param>
+            shown to the user. May be <c>null</c> if error is unknown.</param>
         <summary>Notifies that an error occurred while laying out the document.</summary>
         <remarks>
           <para>
@@ -222,7 +222,7 @@
         <Parameter Name="changed" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="info">An info object describing the document. Cannot be &lt;code&gt;null&lt;/code&gt;.</param>
+        <param name="info">An info object describing the document. Cannot be <c>null</c>.</param>
         <param name="changed">Whether the layout changed.</param>
         <summary>Notifies that the layout finished and whether the content changed.</summary>
         <remarks>
diff --git a/docs/Mono.Android/en/Android.Print/PrintDocumentAdapter+WriteResultCallback.xml b/docs/Mono.Android/en/Android.Print/PrintDocumentAdapter+WriteResultCallback.xml
index 062d7180d7..0c42bca48d 100644
--- a/docs/Mono.Android/en/Android.Print/PrintDocumentAdapter+WriteResultCallback.xml
+++ b/docs/Mono.Android/en/Android.Print/PrintDocumentAdapter+WriteResultCallback.xml
@@ -148,7 +148,7 @@
       </Parameters>
       <Docs>
         <param name="error">The &lt;strong&gt;localized&lt;/strong&gt; error message.
-            shown to the user. May be &lt;code&gt;null&lt;/code&gt; if error is unknown.</param>
+            shown to the user. May be <c>null</c> if error is unknown.</param>
         <summary>Notifies that an error occurred while writing the data.</summary>
         <remarks>
           <para>
@@ -182,7 +182,7 @@
       </Parameters>
       <Docs>
         <param name="error">The &lt;strong&gt;localized&lt;/strong&gt; error message.
-            shown to the user. May be &lt;code&gt;null&lt;/code&gt; if error is unknown.</param>
+            shown to the user. May be <c>null</c> if error is unknown.</param>
         <summary>Notifies that an error occurred while writing the data.</summary>
         <remarks>
           <para>
@@ -221,7 +221,7 @@
         <Parameter Name="pages" Type="Android.Print.PageRange[]" />
       </Parameters>
       <Docs>
-        <param name="pages">The pages that were written. Cannot be &lt;code&gt;null&lt;/code&gt;
+        <param name="pages">The pages that were written. Cannot be <c>null</c>
                    or empty. &lt;br /&gt;
                    Returning <c>PageRange#ALL_PAGES</c> indicates that all pages that were
                    requested as the <c>pages</c> parameter in <c>#onWrite</c> were written.</param>
diff --git a/docs/Mono.Android/en/Android.Print/PrintDocumentAdapter.xml b/docs/Mono.Android/en/Android.Print/PrintDocumentAdapter.xml
index b4d764f9e2..6744d24e5c 100644
--- a/docs/Mono.Android/en/Android.Print/PrintDocumentAdapter.xml
+++ b/docs/Mono.Android/en/Android.Print/PrintDocumentAdapter.xml
@@ -100,8 +100,8 @@
         <ReturnType>System.String</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Extra: mapped to a boolean value that is &lt;code&gt;true&lt;/code&gt; if
-            the current layout is for a print preview, &lt;code&gt;false&lt;/code&gt; otherwise.</summary>
+        <summary>Extra: mapped to a boolean value that is <c>true</c> if
+            the current layout is for a print preview, <c>false</c> otherwise.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Print/PrintDocumentInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Print/PrintDocumentInfo+InterfaceConsts.xml
index eb25f1d989..ee970376b5 100644
--- a/docs/Mono.Android/en/Android.Print/PrintDocumentInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Print/PrintDocumentInfo+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Print/PrintJobId+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Print/PrintJobId+InterfaceConsts.xml
index bd048115ce..e52f5ce29c 100644
--- a/docs/Mono.Android/en/Android.Print/PrintJobId+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Print/PrintJobId+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Print/PrintJobInfo+Builder.xml b/docs/Mono.Android/en/Android.Print/PrintJobInfo+Builder.xml
index 45619cd2f1..96c269bc0c 100644
--- a/docs/Mono.Android/en/Android.Print/PrintJobInfo+Builder.xml
+++ b/docs/Mono.Android/en/Android.Print/PrintJobInfo+Builder.xml
@@ -54,7 +54,7 @@
       </Parameters>
       <Docs>
         <param name="prototype">Prototype to use as a starting point.
-            Can be &lt;code&gt;null&lt;/code&gt;.</param>
+            Can be <c>null</c>.</param>
         <summary>Constructor.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Print/PrintJobInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Print/PrintJobInfo+InterfaceConsts.xml
index d8cd1ffc8b..e517cd5b89 100644
--- a/docs/Mono.Android/en/Android.Print/PrintJobInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Print/PrintJobInfo+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Print/PrintJobInfo.xml b/docs/Mono.Android/en/Android.Print/PrintJobInfo.xml
index 398ff2e8db..572ee8f5af 100644
--- a/docs/Mono.Android/en/Android.Print/PrintJobInfo.xml
+++ b/docs/Mono.Android/en/Android.Print/PrintJobInfo.xml
@@ -316,7 +316,7 @@
       <Parameters />
       <Docs>
         <summary>Gets the included pages.</summary>
-        <returns>The included pages or &lt;code&gt;null&lt;/code&gt; if not set.</returns>
+        <returns>The included pages or <c>null</c> if not set.</returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Print/PrintManager.xml b/docs/Mono.Android/en/Android.Print/PrintManager.xml
index fc95c665aa..82f41c3056 100644
--- a/docs/Mono.Android/en/Android.Print/PrintManager.xml
+++ b/docs/Mono.Android/en/Android.Print/PrintManager.xml
@@ -91,7 +91,7 @@
       <Docs>
         <param name="printJobName">A name for the new print job which is shown to the user.</param>
         <param name="documentAdapter">An adapter that emits the document to print.</param>
-        <param name="attributes">The default print job attributes or &lt;code&gt;null&lt;/code&gt;.</param>
+        <param name="attributes">The default print job attributes or <c>null</c>.</param>
         <summary>Creates a print job for printing a <c>PrintDocumentAdapter</c> with
             default print attributes.</summary>
         <returns>The created print job on success or null on failure.</returns>
diff --git a/docs/Mono.Android/en/Android.Print/PrinterCapabilitiesInfo+Builder.xml b/docs/Mono.Android/en/Android.Print/PrinterCapabilitiesInfo+Builder.xml
index f165aaaa41..90f24c48f6 100644
--- a/docs/Mono.Android/en/Android.Print/PrinterCapabilitiesInfo+Builder.xml
+++ b/docs/Mono.Android/en/Android.Print/PrinterCapabilitiesInfo+Builder.xml
@@ -53,7 +53,7 @@
         <Parameter Name="printerId" Type="Android.Print.PrinterId" />
       </Parameters>
       <Docs>
-        <param name="printerId">The printer id. Cannot be &lt;code&gt;null&lt;/code&gt;.</param>
+        <param name="printerId">The printer id. Cannot be <c>null</c>.</param>
         <summary>Creates a new instance.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Print/PrinterCapabilitiesInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Print/PrinterCapabilitiesInfo+InterfaceConsts.xml
index abc4abef97..9fb3d343c1 100644
--- a/docs/Mono.Android/en/Android.Print/PrinterCapabilitiesInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Print/PrinterCapabilitiesInfo+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Print/PrinterId+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Print/PrinterId+InterfaceConsts.xml
index 84168da2e3..b3f14a8c6f 100644
--- a/docs/Mono.Android/en/Android.Print/PrinterId+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Print/PrinterId+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Print/PrinterInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Print/PrinterInfo+InterfaceConsts.xml
index 5cef16c5fe..fe00fb7cc6 100644
--- a/docs/Mono.Android/en/Android.Print/PrinterInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Print/PrinterInfo+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Provider/ContactsContract+SimAccount+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Provider/ContactsContract+SimAccount+InterfaceConsts.xml
index ae623068b9..1f0fd330ea 100644
--- a/docs/Mono.Android/en/Android.Provider/ContactsContract+SimAccount+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Provider/ContactsContract+SimAccount+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Provider/DocumentsContract+Path+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Provider/DocumentsContract+Path+InterfaceConsts.xml
index 6f52168fc0..29b4d8aaea 100644
--- a/docs/Mono.Android/en/Android.Provider/DocumentsContract+Path+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Provider/DocumentsContract+Path+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.SE.Omapi/Channel.xml b/docs/Mono.Android/en/Android.SE.Omapi/Channel.xml
index 51df5d34fc..3db5e5c584 100644
--- a/docs/Mono.Android/en/Android.SE.Omapi/Channel.xml
+++ b/docs/Mono.Android/en/Android.SE.Omapi/Channel.xml
@@ -151,7 +151,8 @@
       </ReturnValue>
       <Docs>
         <summary>Returns a boolean telling if this channel is the basic channel.</summary>
-        <value>&lt;code&gt;true&lt;/code&gt; if this channel is a basic channel. &lt;code&gt;false&lt;/code&gt; if
+        <value>
+          <c>true</c> if this channel is a basic channel. <c>false</c> if
                     this channel is a logical channel.</value>
         <remarks>
           <para>
@@ -191,8 +192,9 @@
       </ReturnValue>
       <Docs>
         <summary>Tells if this channel is open.</summary>
-        <value>&lt;code&gt;false&lt;/code&gt; if the channel is closed or in case of an error.
-                    &lt;code&gt;true&lt;/code&gt; otherwise.</value>
+        <value>
+          <c>false</c> if the channel is closed or in case of an error.
+                    <c>true</c> otherwise.</value>
         <remarks>
           <para>
             <format type="text/html">
@@ -262,8 +264,9 @@
       <Docs>
         <summary>Performs a selection of the next Applet on this channel that matches to the partial AID
             specified in the openBasicChannel(byte[] aid) or openLogicalChannel(byte[] aid) method.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if new Applet was selected on this channel.
-                           &lt;code&gt;false&lt;/code&gt; the already selected Applet stays selected on this channel.</returns>
+        <returns>
+          <c>true</c> if new Applet was selected on this channel.
+                           <c>false</c> the already selected Applet stays selected on this channel.</returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.SE.Omapi/Reader.xml b/docs/Mono.Android/en/Android.SE.Omapi/Reader.xml
index 18889aef72..bcad4308db 100644
--- a/docs/Mono.Android/en/Android.SE.Omapi/Reader.xml
+++ b/docs/Mono.Android/en/Android.SE.Omapi/Reader.xml
@@ -91,7 +91,8 @@
       </ReturnValue>
       <Docs>
         <summary>Check if a Secure Element is present in this reader.</summary>
-        <value>&lt;code&gt;true&lt;/code&gt; if the SE is present, &lt;code&gt;false&lt;/code&gt; otherwise.</value>
+        <value>
+          <c>true</c> if the SE is present, <c>false</c> otherwise.</value>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.SE.Omapi/SEService.xml b/docs/Mono.Android/en/Android.SE.Omapi/SEService.xml
index 7b03d44b70..f7832b95a3 100644
--- a/docs/Mono.Android/en/Android.SE.Omapi/SEService.xml
+++ b/docs/Mono.Android/en/Android.SE.Omapi/SEService.xml
@@ -280,7 +280,8 @@
       </ReturnValue>
       <Docs>
         <summary>Tells whether or not the service is connected.</summary>
-        <value>&lt;code&gt;true&lt;/code&gt; if the service is connected.</value>
+        <value>
+          <c>true</c> if the service is connected.</value>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.SE.Omapi/Session.xml b/docs/Mono.Android/en/Android.SE.Omapi/Session.xml
index 6d686b3f1e..7f41c61c6a 100644
--- a/docs/Mono.Android/en/Android.SE.Omapi/Session.xml
+++ b/docs/Mono.Android/en/Android.SE.Omapi/Session.xml
@@ -164,7 +164,8 @@
       </ReturnValue>
       <Docs>
         <summary>Tells if this session is closed.</summary>
-        <value>&lt;code&gt;true&lt;/code&gt; if the session is closed, false otherwise.</value>
+        <value>
+          <c>true</c> if the session is closed, false otherwise.</value>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Security/AppUriAuthenticationPolicy+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Security/AppUriAuthenticationPolicy+InterfaceConsts.xml
index 47525ef175..1bdcdbcb24 100644
--- a/docs/Mono.Android/en/Android.Security/AppUriAuthenticationPolicy+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Security/AppUriAuthenticationPolicy+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Service.Autofill/BatchUpdates+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Service.Autofill/BatchUpdates+InterfaceConsts.xml
index 143fa086cd..75625a206d 100644
--- a/docs/Mono.Android/en/Android.Service.Autofill/BatchUpdates+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Service.Autofill/BatchUpdates+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Service.Autofill/CharSequenceTransformation+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Service.Autofill/CharSequenceTransformation+InterfaceConsts.xml
index b7b5ca4b71..770a3305f9 100644
--- a/docs/Mono.Android/en/Android.Service.Autofill/CharSequenceTransformation+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Service.Autofill/CharSequenceTransformation+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Service.Autofill/CustomDescription+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Service.Autofill/CustomDescription+InterfaceConsts.xml
index 22551dfece..26635863dc 100644
--- a/docs/Mono.Android/en/Android.Service.Autofill/CustomDescription+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Service.Autofill/CustomDescription+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Service.Autofill/Dataset+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Service.Autofill/Dataset+InterfaceConsts.xml
index 3b825c55d4..faac27dbc4 100644
--- a/docs/Mono.Android/en/Android.Service.Autofill/Dataset+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Service.Autofill/Dataset+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Service.Autofill/Dataset.xml b/docs/Mono.Android/en/Android.Service.Autofill/Dataset.xml
index 2e6ddaff92..579380fc1f 100644
--- a/docs/Mono.Android/en/Android.Service.Autofill/Dataset.xml
+++ b/docs/Mono.Android/en/Android.Service.Autofill/Dataset.xml
@@ -31,7 +31,7 @@
     </Attribute>
   </Attributes>
   <Docs>
-    <summary>A &lt;code&gt;Dataset&lt;/code&gt; object represents a group of fields (key / value pairs) used
+    <summary>A <c>Dataset</c> object represents a group of fields (key / value pairs) used
             to autofill parts of a screen.</summary>
     <remarks>
       <para>
diff --git a/docs/Mono.Android/en/Android.Service.Autofill/DateTransformation+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Service.Autofill/DateTransformation+InterfaceConsts.xml
index 6ef9b0c834..fd70e2b404 100644
--- a/docs/Mono.Android/en/Android.Service.Autofill/DateTransformation+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Service.Autofill/DateTransformation+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Service.Autofill/DateValueSanitizer+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Service.Autofill/DateValueSanitizer+InterfaceConsts.xml
index f881083dee..dede60a8e2 100644
--- a/docs/Mono.Android/en/Android.Service.Autofill/DateValueSanitizer+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Service.Autofill/DateValueSanitizer+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Service.Autofill/FillCallback.xml b/docs/Mono.Android/en/Android.Service.Autofill/FillCallback.xml
index 029b9868e8..04e73ce16f 100644
--- a/docs/Mono.Android/en/Android.Service.Autofill/FillCallback.xml
+++ b/docs/Mono.Android/en/Android.Service.Autofill/FillCallback.xml
@@ -18,7 +18,8 @@
     </Attribute>
   </Attributes>
   <Docs>
-    <summary>&lt;code&gt;FillCallback&lt;/code&gt; handles autofill requests from the <c>AutofillService</c> into
+    <summary>
+      <c>FillCallback</c> handles autofill requests from the <c>AutofillService</c> into
             the <c>Activity</c> being autofilled.</summary>
     <remarks>
       <para>
diff --git a/docs/Mono.Android/en/Android.Service.Autofill/FillContext+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Service.Autofill/FillContext+InterfaceConsts.xml
index 34dfe0bd74..e32ff2889f 100644
--- a/docs/Mono.Android/en/Android.Service.Autofill/FillContext+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Service.Autofill/FillContext+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Service.Autofill/FillEventHistory+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Service.Autofill/FillEventHistory+InterfaceConsts.xml
index 3fcdd1de6c..54f5c3258b 100644
--- a/docs/Mono.Android/en/Android.Service.Autofill/FillEventHistory+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Service.Autofill/FillEventHistory+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Service.Autofill/FillRequest+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Service.Autofill/FillRequest+InterfaceConsts.xml
index 4177162da4..5f9cc761a4 100644
--- a/docs/Mono.Android/en/Android.Service.Autofill/FillRequest+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Service.Autofill/FillRequest+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Service.Autofill/FillResponse+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Service.Autofill/FillResponse+InterfaceConsts.xml
index adb7d51af3..bef407f748 100644
--- a/docs/Mono.Android/en/Android.Service.Autofill/FillResponse+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Service.Autofill/FillResponse+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Service.Autofill/ImageTransformation+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Service.Autofill/ImageTransformation+InterfaceConsts.xml
index f8a39d299b..95ffe11787 100644
--- a/docs/Mono.Android/en/Android.Service.Autofill/ImageTransformation+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Service.Autofill/ImageTransformation+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Service.Autofill/InlinePresentation+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Service.Autofill/InlinePresentation+InterfaceConsts.xml
index 7143b0cd82..dea66839b1 100644
--- a/docs/Mono.Android/en/Android.Service.Autofill/InlinePresentation+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Service.Autofill/InlinePresentation+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Service.Autofill/LuhnChecksumValidator+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Service.Autofill/LuhnChecksumValidator+InterfaceConsts.xml
index 92382cb69b..46f134cc36 100644
--- a/docs/Mono.Android/en/Android.Service.Autofill/LuhnChecksumValidator+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Service.Autofill/LuhnChecksumValidator+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Service.Autofill/RegexValidator+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Service.Autofill/RegexValidator+InterfaceConsts.xml
index 0de521e242..bce8df18c0 100644
--- a/docs/Mono.Android/en/Android.Service.Autofill/RegexValidator+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Service.Autofill/RegexValidator+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Service.Autofill/SaveInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Service.Autofill/SaveInfo+InterfaceConsts.xml
index c3ec43d7ef..129bd9344b 100644
--- a/docs/Mono.Android/en/Android.Service.Autofill/SaveInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Service.Autofill/SaveInfo+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Service.Autofill/SaveRequest+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Service.Autofill/SaveRequest+InterfaceConsts.xml
index 0565b4f1f4..452365aa23 100644
--- a/docs/Mono.Android/en/Android.Service.Autofill/SaveRequest+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Service.Autofill/SaveRequest+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Service.Autofill/TextValueSanitizer+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Service.Autofill/TextValueSanitizer+InterfaceConsts.xml
index f21ad9c370..0901792a85 100644
--- a/docs/Mono.Android/en/Android.Service.Autofill/TextValueSanitizer+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Service.Autofill/TextValueSanitizer+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Service.Autofill/UserData+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Service.Autofill/UserData+InterfaceConsts.xml
index 7a2c0874f7..8b53af1e58 100644
--- a/docs/Mono.Android/en/Android.Service.Autofill/UserData+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Service.Autofill/UserData+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Service.Autofill/VisibilitySetterAction+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Service.Autofill/VisibilitySetterAction+InterfaceConsts.xml
index dae5f23ab8..2f58d9f2a9 100644
--- a/docs/Mono.Android/en/Android.Service.Autofill/VisibilitySetterAction+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Service.Autofill/VisibilitySetterAction+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Service.Carrier/CarrierIdentifier+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Service.Carrier/CarrierIdentifier+InterfaceConsts.xml
index e0b0248419..3b29a91767 100644
--- a/docs/Mono.Android/en/Android.Service.Carrier/CarrierIdentifier+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Service.Carrier/CarrierIdentifier+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Service.Carrier/MessagePdu+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Service.Carrier/MessagePdu+InterfaceConsts.xml
index a43dde68ae..f4dce3bf96 100644
--- a/docs/Mono.Android/en/Android.Service.Carrier/MessagePdu+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Service.Carrier/MessagePdu+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Service.Chooser/ChooserTarget+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Service.Chooser/ChooserTarget+InterfaceConsts.xml
index 9d4ca25202..a8dace730d 100644
--- a/docs/Mono.Android/en/Android.Service.Chooser/ChooserTarget+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Service.Chooser/ChooserTarget+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Service.Chooser/ChooserTargetService.xml b/docs/Mono.Android/en/Android.Service.Chooser/ChooserTargetService.xml
index b0fca2932e..c50d63974e 100644
--- a/docs/Mono.Android/en/Android.Service.Chooser/ChooserTargetService.xml
+++ b/docs/Mono.Android/en/Android.Service.Chooser/ChooserTargetService.xml
@@ -182,8 +182,8 @@
         <ReturnType>System.String</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>The name of the &lt;code&gt;meta-data&lt;/code&gt; element that must be present on an
-            &lt;code&gt;activity&lt;/code&gt; element in a manifest to link it to a ChooserTargetService</summary>
+        <summary>The name of the <c>meta-data</c> element that must be present on an
+            <c>activity</c> element in a manifest to link it to a ChooserTargetService</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Service.Controls.Templates/ControlButton+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Service.Controls.Templates/ControlButton+InterfaceConsts.xml
index 44996bb9b1..e960e3cc44 100644
--- a/docs/Mono.Android/en/Android.Service.Controls.Templates/ControlButton+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Service.Controls.Templates/ControlButton+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Service.Controls/Control+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Service.Controls/Control+InterfaceConsts.xml
index a920aff0c5..a7a33b0c5a 100644
--- a/docs/Mono.Android/en/Android.Service.Controls/Control+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Service.Controls/Control+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Service.Notification/Condition+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Service.Notification/Condition+InterfaceConsts.xml
index 5764928fe4..d4161aeb8d 100644
--- a/docs/Mono.Android/en/Android.Service.Notification/Condition+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Service.Notification/Condition+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Service.Notification/NotificationListenerService+RankingMap+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Service.Notification/NotificationListenerService+RankingMap+InterfaceConsts.xml
index 1194e11f98..7adeb7c3de 100644
--- a/docs/Mono.Android/en/Android.Service.Notification/NotificationListenerService+RankingMap+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Service.Notification/NotificationListenerService+RankingMap+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Service.Notification/StatusBarNotification+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Service.Notification/StatusBarNotification+InterfaceConsts.xml
index c7144cd02a..864a9d21e2 100644
--- a/docs/Mono.Android/en/Android.Service.Notification/StatusBarNotification+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Service.Notification/StatusBarNotification+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Service.Notification/ZenPolicy+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Service.Notification/ZenPolicy+InterfaceConsts.xml
index 5db48b9f2d..55e8c55446 100644
--- a/docs/Mono.Android/en/Android.Service.Notification/ZenPolicy+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Service.Notification/ZenPolicy+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Service.QuickAccessWallet/GetWalletCardsError+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Service.QuickAccessWallet/GetWalletCardsError+InterfaceConsts.xml
index 5e8ee3abfe..0d9564da1f 100644
--- a/docs/Mono.Android/en/Android.Service.QuickAccessWallet/GetWalletCardsError+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Service.QuickAccessWallet/GetWalletCardsError+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Service.QuickAccessWallet/GetWalletCardsRequest+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Service.QuickAccessWallet/GetWalletCardsRequest+InterfaceConsts.xml
index a942aef7ef..eb52492790 100644
--- a/docs/Mono.Android/en/Android.Service.QuickAccessWallet/GetWalletCardsRequest+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Service.QuickAccessWallet/GetWalletCardsRequest+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Service.QuickAccessWallet/GetWalletCardsResponse+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Service.QuickAccessWallet/GetWalletCardsResponse+InterfaceConsts.xml
index 71ebeb8fd7..2ed42e2159 100644
--- a/docs/Mono.Android/en/Android.Service.QuickAccessWallet/GetWalletCardsResponse+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Service.QuickAccessWallet/GetWalletCardsResponse+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Service.QuickAccessWallet/SelectWalletCardRequest+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Service.QuickAccessWallet/SelectWalletCardRequest+InterfaceConsts.xml
index 3a9bca6372..4654a0b510 100644
--- a/docs/Mono.Android/en/Android.Service.QuickAccessWallet/SelectWalletCardRequest+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Service.QuickAccessWallet/SelectWalletCardRequest+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Service.QuickAccessWallet/WalletCard+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Service.QuickAccessWallet/WalletCard+InterfaceConsts.xml
index e87b2d23b8..17e95f11a4 100644
--- a/docs/Mono.Android/en/Android.Service.QuickAccessWallet/WalletCard+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Service.QuickAccessWallet/WalletCard+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Service.QuickAccessWallet/WalletServiceEvent+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Service.QuickAccessWallet/WalletServiceEvent+InterfaceConsts.xml
index 41bd25127a..14c6de3f7b 100644
--- a/docs/Mono.Android/en/Android.Service.QuickAccessWallet/WalletServiceEvent+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Service.QuickAccessWallet/WalletServiceEvent+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Service.QuickSettings/Tile+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Service.QuickSettings/Tile+InterfaceConsts.xml
index 13ad69a0a0..d6ca329fcb 100644
--- a/docs/Mono.Android/en/Android.Service.QuickSettings/Tile+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Service.QuickSettings/Tile+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Speech.Tts/TextToSpeech.xml b/docs/Mono.Android/en/Android.Speech.Tts/TextToSpeech.xml
index c0d3e26433..6159ff21ad 100644
--- a/docs/Mono.Android/en/Android.Speech.Tts/TextToSpeech.xml
+++ b/docs/Mono.Android/en/Android.Speech.Tts/TextToSpeech.xml
@@ -209,7 +209,7 @@
       </Parameters>
       <Docs>
         <param name="earcon">The name of the earcon.
-                       Example: &lt;code&gt;"[tick]"&lt;/code&gt;</param>
+                       Example: <c>"[tick]"</c></param>
         <param name="uri">Uri object pointing to the sound file.</param>
         <summary>Adds a mapping between a string of text and a sound file.</summary>
         <returns>Code indicating success or failure. See <c>#ERROR</c> and <c>#SUCCESS</c>.</returns>
@@ -258,7 +258,7 @@
       </Parameters>
       <Docs>
         <param name="earcon">The name of the earcon.
-                       Example: &lt;code&gt;"[tick]"&lt;/code&gt;</param>
+                       Example: <c>"[tick]"</c></param>
         <param name="file">File object pointing to the sound file.</param>
         <summary>Adds a mapping between a string of text and a sound file.</summary>
         <returns>Code indicating success or failure. See <c>#ERROR</c> and <c>#SUCCESS</c>.</returns>
@@ -311,7 +311,7 @@
       </Parameters>
       <Docs>
         <param name="earcon">The name of the earcon.
-                       Example: &lt;code&gt;"[tick]"&lt;/code&gt;</param>
+                       Example: <c>"[tick]"</c></param>
         <param name="filename">The full path to the sound file (for example:
                        "/sdcard/mysounds/tick.wav")</param>
         <summary>Adds a mapping between a string of text and a sound file.</summary>
@@ -363,17 +363,16 @@
       </Parameters>
       <Docs>
         <param name="earcon">The name of the earcon.
-                       Example: &lt;code&gt;"[tick]"&lt;/code&gt;&lt;br/&gt;</param>
+                       Example: <c>"[tick]"</c>&lt;br/&gt;</param>
         <param name="packagename">the package name of the application that contains the
                        resource. This can for instance be the package name of your own application.
                        Example: &lt;b&gt;"com.google.marvin.compass"&lt;/b&gt;&lt;br/&gt;
                        The package name can be found in the AndroidManifest.xml of
                        the application containing the resource.
                        &lt;p&gt;
-                       &lt;code&gt;&amp;lt;manifest xmlns:android=&amp;quot;...&amp;quot;
-                 package=&amp;quot;&lt;b&gt;com.google.marvin.compass&lt;/b&gt;&amp;quot;&amp;gt;&lt;/code&gt;
-                       &lt;/p&gt;</param>
-        <param name="resourceId">Example: &lt;code&gt;R.raw.tick_snd&lt;/code&gt;</param>
+                       <c>&amp;lt;manifest xmlns:android=&amp;quot;...&amp;quot;
+                 package=&amp;quot;&lt;b&gt;com.google.marvin.compass&lt;/b&gt;&amp;quot;&amp;gt;</c>&lt;/p&gt;</param>
+        <param name="resourceId">Example: <c>R.raw.tick_snd</c></param>
         <summary>Adds a mapping between a string of text and a sound resource in a
             package.</summary>
         <returns>Code indicating success or failure. See <c>#ERROR</c> and <c>#SUCCESS</c>.</returns>
@@ -422,7 +421,7 @@
         <Parameter Name="uri" Type="Android.Net.Uri" />
       </Parameters>
       <Docs>
-        <param name="text">The string of text. Example: &lt;code&gt;"south_south_east"&lt;/code&gt;</param>
+        <param name="text">The string of text. Example: <c>"south_south_east"</c></param>
         <param name="uri">Uri object pointing to the sound file.</param>
         <summary>Adds a mapping between a CharSequence (may be spanned with TtsSpans) and a sound file.</summary>
         <returns>Code indicating success or failure. See <c>#ERROR</c> and <c>#SUCCESS</c>.</returns>
@@ -470,7 +469,7 @@
         <Parameter Name="file" Type="Java.IO.File" />
       </Parameters>
       <Docs>
-        <param name="text">The string of text. Example: &lt;code&gt;"south_south_east"&lt;/code&gt;</param>
+        <param name="text">The string of text. Example: <c>"south_south_east"</c></param>
         <param name="file">File object pointing to the sound file.</param>
         <summary>Adds a mapping between a CharSequence (may be spanned with TtsSpans) and a sound file.</summary>
         <returns>Code indicating success or failure. See <c>#ERROR</c> and <c>#SUCCESS</c>.</returns>
@@ -506,7 +505,7 @@
         <Parameter Name="uri" Type="Android.Net.Uri" />
       </Parameters>
       <Docs>
-        <param name="text">The string of text. Example: &lt;code&gt;"south_south_east"&lt;/code&gt;</param>
+        <param name="text">The string of text. Example: <c>"south_south_east"</c></param>
         <param name="uri">Uri object pointing to the sound file.</param>
         <summary>Adds a mapping between a CharSequence (may be spanned with TtsSpans) and a sound file.</summary>
         <returns>Code indicating success or failure. See <c>#ERROR</c> and <c>#SUCCESS</c>.</returns>
@@ -542,7 +541,7 @@
         <Parameter Name="file" Type="Java.IO.File" />
       </Parameters>
       <Docs>
-        <param name="text">The string of text. Example: &lt;code&gt;"south_south_east"&lt;/code&gt;</param>
+        <param name="text">The string of text. Example: <c>"south_south_east"</c></param>
         <param name="file">File object pointing to the sound file.</param>
         <summary>Adds a mapping between a CharSequence (may be spanned with TtsSpans) and a sound file.</summary>
         <returns>Code indicating success or failure. See <c>#ERROR</c> and <c>#SUCCESS</c>.</returns>
@@ -590,7 +589,7 @@
         <Parameter Name="filename" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="text">The string of text. Example: &lt;code&gt;"south_south_east"&lt;/code&gt;</param>
+        <param name="text">The string of text. Example: <c>"south_south_east"</c></param>
         <param name="filename">The full path to the sound file (for example:
                        "/sdcard/mysounds/hello.wav")</param>
         <summary>Adds a mapping between a string of text and a sound file.</summary>
@@ -641,7 +640,7 @@
         <Parameter Name="resourceId" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="text">The string of text. Example: &lt;code&gt;"south_south_east"&lt;/code&gt;</param>
+        <param name="text">The string of text. Example: <c>"south_south_east"</c></param>
         <param name="packagename">Pass the packagename of the application that contains the
                        resource. If the resource is in your own application (this is
                        the most common case), then put the packagename of your
@@ -650,10 +649,9 @@
                        The packagename can be found in the AndroidManifest.xml of
                        your application.
                        &lt;p&gt;
-                       &lt;code&gt;&amp;lt;manifest xmlns:android=&amp;quot;...&amp;quot;
-                 package=&amp;quot;&lt;b&gt;com.google.marvin.compass&lt;/b&gt;&amp;quot;&amp;gt;&lt;/code&gt;
-                       &lt;/p&gt;</param>
-        <param name="resourceId">Example: &lt;code&gt;R.raw.south_south_east&lt;/code&gt;</param>
+                       <c>&amp;lt;manifest xmlns:android=&amp;quot;...&amp;quot;
+                 package=&amp;quot;&lt;b&gt;com.google.marvin.compass&lt;/b&gt;&amp;quot;&amp;gt;</c>&lt;/p&gt;</param>
+        <param name="resourceId">Example: <c>R.raw.south_south_east</c></param>
         <summary>Adds a mapping between a CharSequence (may be spanned with TtsSpans) of text
             and a sound resource in a package.</summary>
         <returns>Code indicating success or failure. See <c>#ERROR</c> and <c>#SUCCESS</c>.</returns>
@@ -702,7 +700,7 @@
         <Parameter Name="resourceId" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="text">The string of text. Example: &lt;code&gt;"south_south_east"&lt;/code&gt;</param>
+        <param name="text">The string of text. Example: <c>"south_south_east"</c></param>
         <param name="packagename">Pass the packagename of the application that contains the
                        resource. If the resource is in your own application (this is
                        the most common case), then put the packagename of your
@@ -711,10 +709,9 @@
                        The packagename can be found in the AndroidManifest.xml of
                        your application.
                        &lt;p&gt;
-                       &lt;code&gt;&amp;lt;manifest xmlns:android=&amp;quot;...&amp;quot;
-                 package=&amp;quot;&lt;b&gt;com.google.marvin.compass&lt;/b&gt;&amp;quot;&amp;gt;&lt;/code&gt;
-                       &lt;/p&gt;</param>
-        <param name="resourceId">Example: &lt;code&gt;R.raw.south_south_east&lt;/code&gt;</param>
+                       <c>&amp;lt;manifest xmlns:android=&amp;quot;...&amp;quot;
+                 package=&amp;quot;&lt;b&gt;com.google.marvin.compass&lt;/b&gt;&amp;quot;&amp;gt;</c>&lt;/p&gt;</param>
+        <param name="resourceId">Example: <c>R.raw.south_south_east</c></param>
         <summary>Adds a mapping between a string of text and a sound resource in a
             package.</summary>
         <returns>Code indicating success or failure. See <c>#ERROR</c> and <c>#SUCCESS</c>.</returns>
diff --git a/docs/Mono.Android/en/Android.Speech.Tts/Voice+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Speech.Tts/Voice+InterfaceConsts.xml
index 3fc9778ef1..f22e18d496 100644
--- a/docs/Mono.Android/en/Android.Speech.Tts/Voice+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Speech.Tts/Voice+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Telecom/Call+RttCall.xml b/docs/Mono.Android/en/Android.Telecom/Call+RttCall.xml
index 7df73ae2d9..c57ca550f2 100644
--- a/docs/Mono.Android/en/Android.Telecom/Call+RttCall.xml
+++ b/docs/Mono.Android/en/Android.Telecom/Call+RttCall.xml
@@ -310,17 +310,8 @@
         <Parameter Name="input" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="input}}">into the outgoing text stream for this RTT call. Since
-            RTT transmits text in real-time, this method should be called once for each user action.
-            For example, when the user enters text as discrete characters using the keyboard, this
-            method should be called once for each character. However, if the user enters text by
-            pasting or autocomplete, the entire contents of the pasted or autocompleted text should
-            be sent in one call to this method.
-            
-            This method is not thread-safe -- calling it from multiple threads simultaneously may
-            lead to interleaved text.</param>
         <param name="input">The message to send to the remote user.</param>
-        <summary>Writes the string {</summary>
+        <summary>Writes the string <paramref>input</paramref> into the outgoing text stream for this RTT call.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Telecom/CallAudioState+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Telecom/CallAudioState+InterfaceConsts.xml
index 7a5211ac4a..fbc57acd40 100644
--- a/docs/Mono.Android/en/Android.Telecom/CallAudioState+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Telecom/CallAudioState+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Telecom/Connection+RttTextStream.xml b/docs/Mono.Android/en/Android.Telecom/Connection+RttTextStream.xml
index d9281f3a2d..8bfc23f3ef 100644
--- a/docs/Mono.Android/en/Android.Telecom/Connection+RttTextStream.xml
+++ b/docs/Mono.Android/en/Android.Telecom/Connection+RttTextStream.xml
@@ -219,14 +219,8 @@
         <Parameter Name="input" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="input}}">into the text stream to the UI for this RTT call. Since
-            RTT transmits text in real-time, this method should be called as often as text snippets
-            are received from the remote user, even if it is only one character.
-            &lt;p&gt;
-            This method is not thread-safe -- calling it from multiple threads simultaneously may
-            lead to interleaved text.</param>
         <param name="input">The message to send to the in-call app.</param>
-        <summary>Writes the string {</summary>
+        <summary>Writes the string <paramref>input</paramref> into the text stream to the UI for this RTT call.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Telecom/ConnectionRequest+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Telecom/ConnectionRequest+InterfaceConsts.xml
index a2c1b8fefa..0803b893d9 100644
--- a/docs/Mono.Android/en/Android.Telecom/ConnectionRequest+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Telecom/ConnectionRequest+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Telecom/DisconnectCause+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Telecom/DisconnectCause+InterfaceConsts.xml
index a62404797e..f6f27748f2 100644
--- a/docs/Mono.Android/en/Android.Telecom/DisconnectCause+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Telecom/DisconnectCause+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Telecom/GatewayInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Telecom/GatewayInfo+InterfaceConsts.xml
index c53ad1f12d..09b527485b 100644
--- a/docs/Mono.Android/en/Android.Telecom/GatewayInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Telecom/GatewayInfo+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Telecom/PhoneAccount+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Telecom/PhoneAccount+InterfaceConsts.xml
index 2d00d650b5..9011712289 100644
--- a/docs/Mono.Android/en/Android.Telecom/PhoneAccount+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Telecom/PhoneAccount+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Telecom/PhoneAccountHandle+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Telecom/PhoneAccountHandle+InterfaceConsts.xml
index 866064ac3f..6bf0cdfb8b 100644
--- a/docs/Mono.Android/en/Android.Telecom/PhoneAccountHandle+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Telecom/PhoneAccountHandle+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Telecom/PhoneAccountSuggestion+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Telecom/PhoneAccountSuggestion+InterfaceConsts.xml
index 14a19a98bf..e128e1929a 100644
--- a/docs/Mono.Android/en/Android.Telecom/PhoneAccountSuggestion+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Telecom/PhoneAccountSuggestion+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Telecom/StatusHints+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Telecom/StatusHints+InterfaceConsts.xml
index e27ae3c41f..0def899862 100644
--- a/docs/Mono.Android/en/Android.Telecom/StatusHints+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Telecom/StatusHints+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Telecom/VideoProfile+CameraCapabilities+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Telecom/VideoProfile+CameraCapabilities+InterfaceConsts.xml
index 2bd28f4265..629f379053 100644
--- a/docs/Mono.Android/en/Android.Telecom/VideoProfile+CameraCapabilities+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Telecom/VideoProfile+CameraCapabilities+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Telecom/VideoProfile+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Telecom/VideoProfile+InterfaceConsts.xml
index 99a31e3b2e..01115655c2 100644
--- a/docs/Mono.Android/en/Android.Telecom/VideoProfile+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Telecom/VideoProfile+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Telephony.Data/ApnSetting+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Telephony.Data/ApnSetting+InterfaceConsts.xml
index 97b6a18d45..0a9cba3541 100644
--- a/docs/Mono.Android/en/Android.Telephony.Data/ApnSetting+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Telephony.Data/ApnSetting+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Telephony.Data/NetworkSliceInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Telephony.Data/NetworkSliceInfo+InterfaceConsts.xml
index a8336235ab..8e83302185 100644
--- a/docs/Mono.Android/en/Android.Telephony.Data/NetworkSliceInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Telephony.Data/NetworkSliceInfo+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Telephony.Data/NetworkSlicingConfig+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Telephony.Data/NetworkSlicingConfig+InterfaceConsts.xml
index 662554b59e..f1686a41d6 100644
--- a/docs/Mono.Android/en/Android.Telephony.Data/NetworkSlicingConfig+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Telephony.Data/NetworkSlicingConfig+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Telephony.Data/RouteSelectionDescriptor+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Telephony.Data/RouteSelectionDescriptor+InterfaceConsts.xml
index b0c52e6f80..6705c8f9fb 100644
--- a/docs/Mono.Android/en/Android.Telephony.Data/RouteSelectionDescriptor+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Telephony.Data/RouteSelectionDescriptor+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Telephony.Data/TrafficDescriptor+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Telephony.Data/TrafficDescriptor+InterfaceConsts.xml
index 4567b775ee..48520a8ed9 100644
--- a/docs/Mono.Android/en/Android.Telephony.Data/TrafficDescriptor+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Telephony.Data/TrafficDescriptor+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Telephony.Data/UrspRule+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Telephony.Data/UrspRule+InterfaceConsts.xml
index 9592e3bc15..fe908090bf 100644
--- a/docs/Mono.Android/en/Android.Telephony.Data/UrspRule+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Telephony.Data/UrspRule+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Telephony.Emergency/EmergencyNumber+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Telephony.Emergency/EmergencyNumber+InterfaceConsts.xml
index f81d46a7e7..9e5b7f0386 100644
--- a/docs/Mono.Android/en/Android.Telephony.Emergency/EmergencyNumber+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Telephony.Emergency/EmergencyNumber+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Telephony.Euicc/DownloadableSubscription+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Telephony.Euicc/DownloadableSubscription+InterfaceConsts.xml
index 0194285d2a..85f1f972b6 100644
--- a/docs/Mono.Android/en/Android.Telephony.Euicc/DownloadableSubscription+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Telephony.Euicc/DownloadableSubscription+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Telephony.Euicc/EuiccInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Telephony.Euicc/EuiccInfo+InterfaceConsts.xml
index 7f1823409b..75cf7a10aa 100644
--- a/docs/Mono.Android/en/Android.Telephony.Euicc/EuiccInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Telephony.Euicc/EuiccInfo+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Telephony.Gsm/SmsManager.xml b/docs/Mono.Android/en/Android.Telephony.Gsm/SmsManager.xml
index acb233e422..3f8d9b2f56 100644
--- a/docs/Mono.Android/en/Android.Telephony.Gsm/SmsManager.xml
+++ b/docs/Mono.Android/en/Android.Telephony.Gsm/SmsManager.xml
@@ -109,7 +109,7 @@
         <param name="text">the original message.  Must not be null.</param>
         <summary>Divide a text message into several messages, none bigger than
             the maximum SMS message size.</summary>
-        <returns>an &lt;code&gt;ArrayList&lt;/code&gt; of strings that, in order,
+        <returns>an <c>ArrayList</c> of strings that, in order,
               comprise the original message</returns>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Telephony.Gsm/SmsMessage.xml b/docs/Mono.Android/en/Android.Telephony.Gsm/SmsMessage.xml
index 38b4191afd..7efccb178b 100644
--- a/docs/Mono.Android/en/Android.Telephony.Gsm/SmsMessage.xml
+++ b/docs/Mono.Android/en/Android.Telephony.Gsm/SmsMessage.xml
@@ -1021,7 +1021,7 @@
         <ReturnType>System.Boolean</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Returns true iff the &lt;code&gt;TP-Reply-Path&lt;/code&gt; bit is set in
+        <summary>Returns true iff the <c>TP-Reply-Path</c> bit is set in
             this message.</summary>
         <value>To be added.</value>
         <remarks>
diff --git a/docs/Mono.Android/en/Android.Telephony.Ims/ImsReasonInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Telephony.Ims/ImsReasonInfo+InterfaceConsts.xml
index 992939ef46..a1de182c49 100644
--- a/docs/Mono.Android/en/Android.Telephony.Ims/ImsReasonInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Telephony.Ims/ImsReasonInfo+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Telephony.Ims/ImsRegistrationAttributes+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Telephony.Ims/ImsRegistrationAttributes+InterfaceConsts.xml
index 8a54c3af82..914e3c1666 100644
--- a/docs/Mono.Android/en/Android.Telephony.Ims/ImsRegistrationAttributes+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Telephony.Ims/ImsRegistrationAttributes+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Telephony.Mbms/DownloadRequest+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Telephony.Mbms/DownloadRequest+InterfaceConsts.xml
index 81b121e17c..877c1d605c 100644
--- a/docs/Mono.Android/en/Android.Telephony.Mbms/DownloadRequest+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Telephony.Mbms/DownloadRequest+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Telephony.Mbms/FileInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Telephony.Mbms/FileInfo+InterfaceConsts.xml
index 0ea3bbdbb4..adbff528b0 100644
--- a/docs/Mono.Android/en/Android.Telephony.Mbms/FileInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Telephony.Mbms/FileInfo+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Telephony.Mbms/FileServiceInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Telephony.Mbms/FileServiceInfo+InterfaceConsts.xml
index 5ce672fc7d..019e15a7b7 100644
--- a/docs/Mono.Android/en/Android.Telephony.Mbms/FileServiceInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Telephony.Mbms/FileServiceInfo+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Telephony.Mbms/StreamingServiceInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Telephony.Mbms/StreamingServiceInfo+InterfaceConsts.xml
index 17ac123818..e8ed95f25f 100644
--- a/docs/Mono.Android/en/Android.Telephony.Mbms/StreamingServiceInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Telephony.Mbms/StreamingServiceInfo+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Telephony/AvailableNetworkInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Telephony/AvailableNetworkInfo+InterfaceConsts.xml
index 74b3405440..dc7426c5b7 100644
--- a/docs/Mono.Android/en/Android.Telephony/AvailableNetworkInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Telephony/AvailableNetworkInfo+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Telephony/BarringInfo+BarringServiceInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Telephony/BarringInfo+BarringServiceInfo+InterfaceConsts.xml
index 6375852a4c..9441629286 100644
--- a/docs/Mono.Android/en/Android.Telephony/BarringInfo+BarringServiceInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Telephony/BarringInfo+BarringServiceInfo+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Telephony/BarringInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Telephony/BarringInfo+InterfaceConsts.xml
index ea39274e11..6e5f61e6f0 100644
--- a/docs/Mono.Android/en/Android.Telephony/BarringInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Telephony/BarringInfo+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Telephony/CellIdentity+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Telephony/CellIdentity+InterfaceConsts.xml
index 02670baf4e..7e8fca6f2f 100644
--- a/docs/Mono.Android/en/Android.Telephony/CellIdentity+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Telephony/CellIdentity+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Telephony/CellInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Telephony/CellInfo+InterfaceConsts.xml
index 0455ee5409..5660e511b1 100644
--- a/docs/Mono.Android/en/Android.Telephony/CellInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Telephony/CellInfo+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Telephony/CellSignalStrengthCdma+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Telephony/CellSignalStrengthCdma+InterfaceConsts.xml
index f98b3a970b..d066d33253 100644
--- a/docs/Mono.Android/en/Android.Telephony/CellSignalStrengthCdma+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Telephony/CellSignalStrengthCdma+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Telephony/CellSignalStrengthGsm+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Telephony/CellSignalStrengthGsm+InterfaceConsts.xml
index eb294d4f96..b28b9d906a 100644
--- a/docs/Mono.Android/en/Android.Telephony/CellSignalStrengthGsm+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Telephony/CellSignalStrengthGsm+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Telephony/CellSignalStrengthLte+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Telephony/CellSignalStrengthLte+InterfaceConsts.xml
index 76e560f151..8e11799b1e 100644
--- a/docs/Mono.Android/en/Android.Telephony/CellSignalStrengthLte+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Telephony/CellSignalStrengthLte+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Telephony/CellSignalStrengthNr+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Telephony/CellSignalStrengthNr+InterfaceConsts.xml
index 282e8eb770..68149a6be1 100644
--- a/docs/Mono.Android/en/Android.Telephony/CellSignalStrengthNr+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Telephony/CellSignalStrengthNr+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Telephony/CellSignalStrengthTdscdma+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Telephony/CellSignalStrengthTdscdma+InterfaceConsts.xml
index 272d6b963f..a3c48fce4c 100644
--- a/docs/Mono.Android/en/Android.Telephony/CellSignalStrengthTdscdma+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Telephony/CellSignalStrengthTdscdma+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Telephony/CellSignalStrengthWcdma+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Telephony/CellSignalStrengthWcdma+InterfaceConsts.xml
index 5eb67e3d72..ae90a4aa01 100644
--- a/docs/Mono.Android/en/Android.Telephony/CellSignalStrengthWcdma+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Telephony/CellSignalStrengthWcdma+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Telephony/ClosedSubscriberGroupInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Telephony/ClosedSubscriberGroupInfo+InterfaceConsts.xml
index 330ba5dba4..0469fa30fc 100644
--- a/docs/Mono.Android/en/Android.Telephony/ClosedSubscriberGroupInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Telephony/ClosedSubscriberGroupInfo+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Telephony/IccOpenLogicalChannelResponse+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Telephony/IccOpenLogicalChannelResponse+InterfaceConsts.xml
index 29a9453360..d4953eee98 100644
--- a/docs/Mono.Android/en/Android.Telephony/IccOpenLogicalChannelResponse+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Telephony/IccOpenLogicalChannelResponse+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Telephony/NeighboringCellInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Telephony/NeighboringCellInfo+InterfaceConsts.xml
index 089e7d138c..4edc1638c1 100644
--- a/docs/Mono.Android/en/Android.Telephony/NeighboringCellInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Telephony/NeighboringCellInfo+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Telephony/NetworkRegistrationInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Telephony/NetworkRegistrationInfo+InterfaceConsts.xml
index 3f4c6634c3..38e49e42b3 100644
--- a/docs/Mono.Android/en/Android.Telephony/NetworkRegistrationInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Telephony/NetworkRegistrationInfo+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Telephony/NetworkScanRequest+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Telephony/NetworkScanRequest+InterfaceConsts.xml
index 52ffe0f400..00dc218ab7 100644
--- a/docs/Mono.Android/en/Android.Telephony/NetworkScanRequest+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Telephony/NetworkScanRequest+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Telephony/PhoneNumberFormattingTextWatcher.xml b/docs/Mono.Android/en/Android.Telephony/PhoneNumberFormattingTextWatcher.xml
index 6c5d0ac41e..fce6fe6ed4 100644
--- a/docs/Mono.Android/en/Android.Telephony/PhoneNumberFormattingTextWatcher.xml
+++ b/docs/Mono.Android/en/Android.Telephony/PhoneNumberFormattingTextWatcher.xml
@@ -107,7 +107,7 @@
       <Docs>
         <param name="countryCode">the ISO 3166-1 two-letter country code that indicates the country/region
             where the phone number is being entered.</param>
-        <summary>The formatting is based on the given &lt;code&gt;countryCode&lt;/code&gt;.</summary>
+        <summary>The formatting is based on the given <c>countryCode</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Telephony/PhoneNumberUtils.xml b/docs/Mono.Android/en/Android.Telephony/PhoneNumberUtils.xml
index 5fd4afc799..ad601ba3ba 100644
--- a/docs/Mono.Android/en/Android.Telephony/PhoneNumberUtils.xml
+++ b/docs/Mono.Android/en/Android.Telephony/PhoneNumberUtils.xml
@@ -604,9 +604,8 @@
       </Parameters>
       <Docs>
         <param name="phoneNumberString">A <c>String</c> the entirety of which represents a phone number.</param>
-        <param name="phoneNumberString}.}.">phoneNumberString}.</param>
         <summary>Create a <c>TtsSpan</c> for the supplied <c>String</c>.</summary>
-        <returns>A <c>TtsSpan</c> for {</returns>
+        <returns>A <c>TtsSpan</c> for <paramref>phoneNumberString</paramref>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1226,7 +1225,7 @@
         <param name="context">a context to use for database access</param>
         <summary>Extracts the phone number from an Intent.</summary>
         <returns>the phone number that would be called by the intent, or
-                    &lt;code&gt;null&lt;/code&gt; if the number cannot be found.</returns>
+                    <c>null</c> if the number cannot be found.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1724,7 +1723,7 @@
       </Parameters>
       <Docs>
         <param name="address">To be added.</param>
-        <summary>Return true iff the network portion of &lt;code&gt;address&lt;/code&gt; is,
+        <summary>Return true iff the network portion of <c>address</c> is,
             as far as we can tell on the device, suitable for use as an SMS
             destination address.</summary>
         <returns>To be added.</returns>
diff --git a/docs/Mono.Android/en/Android.Telephony/PhysicalChannelConfig+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Telephony/PhysicalChannelConfig+InterfaceConsts.xml
index 3dad05726d..47aa30e972 100644
--- a/docs/Mono.Android/en/Android.Telephony/PhysicalChannelConfig+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Telephony/PhysicalChannelConfig+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Telephony/PreciseDataConnectionState+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Telephony/PreciseDataConnectionState+InterfaceConsts.xml
index 7a9ee43afc..8b39e825d7 100644
--- a/docs/Mono.Android/en/Android.Telephony/PreciseDataConnectionState+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Telephony/PreciseDataConnectionState+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Telephony/RadioAccessSpecifier+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Telephony/RadioAccessSpecifier+InterfaceConsts.xml
index 96ed19a4d4..1e5ae44817 100644
--- a/docs/Mono.Android/en/Android.Telephony/RadioAccessSpecifier+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Telephony/RadioAccessSpecifier+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Telephony/ServiceState+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Telephony/ServiceState+InterfaceConsts.xml
index a6024f9540..3725fbf78f 100644
--- a/docs/Mono.Android/en/Android.Telephony/ServiceState+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Telephony/ServiceState+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Telephony/SignalStrength+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Telephony/SignalStrength+InterfaceConsts.xml
index 7c6ecc7fb8..1cec3c36c7 100644
--- a/docs/Mono.Android/en/Android.Telephony/SignalStrength+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Telephony/SignalStrength+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Telephony/SignalStrengthUpdateRequest+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Telephony/SignalStrengthUpdateRequest+InterfaceConsts.xml
index dc6aa7a4dd..06e5bf2652 100644
--- a/docs/Mono.Android/en/Android.Telephony/SignalStrengthUpdateRequest+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Telephony/SignalStrengthUpdateRequest+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Telephony/SignalThresholdInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Telephony/SignalThresholdInfo+InterfaceConsts.xml
index c749d76acd..18315ec1e5 100644
--- a/docs/Mono.Android/en/Android.Telephony/SignalThresholdInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Telephony/SignalThresholdInfo+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Telephony/SmsManager.xml b/docs/Mono.Android/en/Android.Telephony/SmsManager.xml
index 6315d988e0..9bfab1d25c 100644
--- a/docs/Mono.Android/en/Android.Telephony/SmsManager.xml
+++ b/docs/Mono.Android/en/Android.Telephony/SmsManager.xml
@@ -299,7 +299,7 @@
       <Docs>
         <param name="text">the original message. Must not be null.</param>
         <summary>Divide a message text into several fragments, none bigger than the maximum SMS message size.</summary>
-        <returns>an &lt;code&gt;ArrayList&lt;/code&gt; of strings that, in order, comprise the original message.</returns>
+        <returns>an <c>ArrayList</c> of strings that, in order, comprise the original message.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -350,7 +350,7 @@
         <param name="contentUri">the content uri to which the downloaded pdu will be written</param>
         <param name="configOverrides">the carrier-specific messaging configuration values to override for
              downloading the message.</param>
-        <param name="downloadedIntent">if not NULL this &lt;code&gt;PendingIntent&lt;/code&gt; is
+        <param name="downloadedIntent">if not NULL this <c>PendingIntent</c> is
              broadcast when the message is downloaded, or the download is failed</param>
         <summary>Download an MMS message from carrier by a given location URL
             
@@ -407,7 +407,7 @@
         <param name="contentUri">the content uri to which the downloaded pdu will be written</param>
         <param name="configOverrides">the carrier-specific messaging configuration values to override for
              downloading the message.</param>
-        <param name="downloadedIntent">if not NULL this &lt;code&gt;PendingIntent&lt;/code&gt; is
+        <param name="downloadedIntent">if not NULL this <c>PendingIntent</c> is
              broadcast when the message is downloaded, or the download is failed</param>
         <param name="messageId">an id that uniquely identifies the message requested to be downloaded.
             Used for logging and diagnostics purposes. The id may be 0.</param>
@@ -626,7 +626,7 @@
         <param name="pdu">is the byte array of pdu to be injected into android application framework</param>
         <param name="format">is the format of SMS pdu (<c>SmsMessage#FORMAT_3GPP</c> or
              <c>SmsMessage#FORMAT_3GPP2</c>)</param>
-        <param name="receivedIntent">if not NULL this &lt;code&gt;PendingIntent&lt;/code&gt; is
+        <param name="receivedIntent">if not NULL this <c>PendingIntent</c> is
              broadcast when the message is successfully received by the
              android application framework, or failed. This intent is broadcasted at
              the same time an SMS received from radio is acknowledged back.
@@ -4081,70 +4081,70 @@
              the current default SMSC</param>
         <param name="destinationPort">the port to deliver the message to</param>
         <param name="data">the body of the message to send</param>
-        <param name="sentIntent">if not NULL this &lt;code&gt;PendingIntent&lt;/code&gt; is
+        <param name="sentIntent">if not NULL this <c>PendingIntent</c> is
              broadcast when the message is successfully sent, or failed.
-             The result code will be &lt;code&gt;Activity.RESULT_OK&lt;/code&gt; for success,
+             The result code will be <c>Activity.RESULT_OK</c> for success,
              or one of these errors:&lt;br&gt;
-             &lt;code&gt;RESULT_ERROR_GENERIC_FAILURE&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_ERROR_RADIO_OFF&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_ERROR_NULL_PDU&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_ERROR_NO_SERVICE&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_ERROR_LIMIT_EXCEEDED&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_ERROR_FDN_CHECK_FAILURE&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_ERROR_SHORT_CODE_NOT_ALLOWED&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_ERROR_SHORT_CODE_NEVER_ALLOWED&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RADIO_NOT_AVAILABLE&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_NETWORK_REJECT&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_INVALID_ARGUMENTS&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_INVALID_STATE&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_NO_MEMORY&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_INVALID_SMS_FORMAT&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_SYSTEM_ERROR&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_MODEM_ERROR&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_NETWORK_ERROR&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_ENCODING_ERROR&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_INVALID_SMSC_ADDRESS&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_OPERATION_NOT_ALLOWED&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_INTERNAL_ERROR&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_NO_RESOURCES&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_CANCELLED&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_REQUEST_NOT_SUPPORTED&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_NO_BLUETOOTH_SERVICE&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_INVALID_BLUETOOTH_ADDRESS&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_BLUETOOTH_DISCONNECTED&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_UNEXPECTED_EVENT_STOP_SENDING&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_SMS_BLOCKED_DURING_EMERGENCY&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_SMS_SEND_RETRY_FAILED&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_REMOTE_EXCEPTION&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_NO_DEFAULT_SMS_APP&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RIL_RADIO_NOT_AVAILABLE&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RIL_SMS_SEND_FAIL_RETRY&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RIL_NETWORK_REJECT&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RIL_INVALID_STATE&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RIL_INVALID_ARGUMENTS&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RIL_NO_MEMORY&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RIL_REQUEST_RATE_LIMITED&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RIL_INVALID_SMS_FORMAT&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RIL_SYSTEM_ERR&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RIL_ENCODING_ERR&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RIL_INVALID_SMSC_ADDRESS&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RIL_MODEM_ERR&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RIL_NETWORK_ERR&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RIL_INTERNAL_ERR&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RIL_REQUEST_NOT_SUPPORTED&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RIL_INVALID_MODEM_STATE&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RIL_NETWORK_NOT_READY&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RIL_OPERATION_NOT_ALLOWED&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RIL_NO_RESOURCES&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RIL_CANCELLED&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RIL_SIM_ABSENT&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RIL_SIMULTANEOUS_SMS_AND_CALL_NOT_ALLOWED&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RIL_ACCESS_BARRED&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RIL_BLOCKED_DUE_TO_CALL&lt;/code&gt;&lt;br&gt;
-             For &lt;code&gt;RESULT_ERROR_GENERIC_FAILURE&lt;/code&gt; or any of the RESULT_RIL errors,
+             <c>RESULT_ERROR_GENERIC_FAILURE</c>&lt;br&gt;
+             <c>RESULT_ERROR_RADIO_OFF</c>&lt;br&gt;
+             <c>RESULT_ERROR_NULL_PDU</c>&lt;br&gt;
+             <c>RESULT_ERROR_NO_SERVICE</c>&lt;br&gt;
+             <c>RESULT_ERROR_LIMIT_EXCEEDED</c>&lt;br&gt;
+             <c>RESULT_ERROR_FDN_CHECK_FAILURE</c>&lt;br&gt;
+             <c>RESULT_ERROR_SHORT_CODE_NOT_ALLOWED</c>&lt;br&gt;
+             <c>RESULT_ERROR_SHORT_CODE_NEVER_ALLOWED</c>&lt;br&gt;
+             <c>RESULT_RADIO_NOT_AVAILABLE</c>&lt;br&gt;
+             <c>RESULT_NETWORK_REJECT</c>&lt;br&gt;
+             <c>RESULT_INVALID_ARGUMENTS</c>&lt;br&gt;
+             <c>RESULT_INVALID_STATE</c>&lt;br&gt;
+             <c>RESULT_NO_MEMORY</c>&lt;br&gt;
+             <c>RESULT_INVALID_SMS_FORMAT</c>&lt;br&gt;
+             <c>RESULT_SYSTEM_ERROR</c>&lt;br&gt;
+             <c>RESULT_MODEM_ERROR</c>&lt;br&gt;
+             <c>RESULT_NETWORK_ERROR</c>&lt;br&gt;
+             <c>RESULT_ENCODING_ERROR</c>&lt;br&gt;
+             <c>RESULT_INVALID_SMSC_ADDRESS</c>&lt;br&gt;
+             <c>RESULT_OPERATION_NOT_ALLOWED</c>&lt;br&gt;
+             <c>RESULT_INTERNAL_ERROR</c>&lt;br&gt;
+             <c>RESULT_NO_RESOURCES</c>&lt;br&gt;
+             <c>RESULT_CANCELLED</c>&lt;br&gt;
+             <c>RESULT_REQUEST_NOT_SUPPORTED</c>&lt;br&gt;
+             <c>RESULT_NO_BLUETOOTH_SERVICE</c>&lt;br&gt;
+             <c>RESULT_INVALID_BLUETOOTH_ADDRESS</c>&lt;br&gt;
+             <c>RESULT_BLUETOOTH_DISCONNECTED</c>&lt;br&gt;
+             <c>RESULT_UNEXPECTED_EVENT_STOP_SENDING</c>&lt;br&gt;
+             <c>RESULT_SMS_BLOCKED_DURING_EMERGENCY</c>&lt;br&gt;
+             <c>RESULT_SMS_SEND_RETRY_FAILED</c>&lt;br&gt;
+             <c>RESULT_REMOTE_EXCEPTION</c>&lt;br&gt;
+             <c>RESULT_NO_DEFAULT_SMS_APP</c>&lt;br&gt;
+             <c>RESULT_RIL_RADIO_NOT_AVAILABLE</c>&lt;br&gt;
+             <c>RESULT_RIL_SMS_SEND_FAIL_RETRY</c>&lt;br&gt;
+             <c>RESULT_RIL_NETWORK_REJECT</c>&lt;br&gt;
+             <c>RESULT_RIL_INVALID_STATE</c>&lt;br&gt;
+             <c>RESULT_RIL_INVALID_ARGUMENTS</c>&lt;br&gt;
+             <c>RESULT_RIL_NO_MEMORY</c>&lt;br&gt;
+             <c>RESULT_RIL_REQUEST_RATE_LIMITED</c>&lt;br&gt;
+             <c>RESULT_RIL_INVALID_SMS_FORMAT</c>&lt;br&gt;
+             <c>RESULT_RIL_SYSTEM_ERR</c>&lt;br&gt;
+             <c>RESULT_RIL_ENCODING_ERR</c>&lt;br&gt;
+             <c>RESULT_RIL_INVALID_SMSC_ADDRESS</c>&lt;br&gt;
+             <c>RESULT_RIL_MODEM_ERR</c>&lt;br&gt;
+             <c>RESULT_RIL_NETWORK_ERR</c>&lt;br&gt;
+             <c>RESULT_RIL_INTERNAL_ERR</c>&lt;br&gt;
+             <c>RESULT_RIL_REQUEST_NOT_SUPPORTED</c>&lt;br&gt;
+             <c>RESULT_RIL_INVALID_MODEM_STATE</c>&lt;br&gt;
+             <c>RESULT_RIL_NETWORK_NOT_READY</c>&lt;br&gt;
+             <c>RESULT_RIL_OPERATION_NOT_ALLOWED</c>&lt;br&gt;
+             <c>RESULT_RIL_NO_RESOURCES</c>&lt;br&gt;
+             <c>RESULT_RIL_CANCELLED</c>&lt;br&gt;
+             <c>RESULT_RIL_SIM_ABSENT</c>&lt;br&gt;
+             <c>RESULT_RIL_SIMULTANEOUS_SMS_AND_CALL_NOT_ALLOWED</c>&lt;br&gt;
+             <c>RESULT_RIL_ACCESS_BARRED</c>&lt;br&gt;
+             <c>RESULT_RIL_BLOCKED_DUE_TO_CALL</c>&lt;br&gt;
+             For <c>RESULT_ERROR_GENERIC_FAILURE</c> or any of the RESULT_RIL errors,
              the sentIntent may include the extra "errorCode" containing a radio technology specific
              value, generally only useful for troubleshooting.&lt;br&gt;</param>
-        <param name="deliveryIntent">if not NULL this &lt;code&gt;PendingIntent&lt;/code&gt; is
+        <param name="deliveryIntent">if not NULL this <c>PendingIntent</c> is
              broadcast when the message is delivered to the recipient.  The
              raw pdu of the status report is in the extended data ("pdu").</param>
         <summary>Send a data based SMS to a specific application port.</summary>
@@ -4197,7 +4197,7 @@
         <param name="locationUrl">the optional location url where message should be sent to</param>
         <param name="configOverrides">the carrier-specific messaging configuration values to override for
              sending the message.</param>
-        <param name="sentIntent">if not NULL this &lt;code&gt;PendingIntent&lt;/code&gt; is
+        <param name="sentIntent">if not NULL this <c>PendingIntent</c> is
              broadcast when the message is successfully sent, or failed</param>
         <summary>Send an MMS message
             
@@ -4253,7 +4253,7 @@
         <param name="locationUrl">the optional location url where message should be sent to</param>
         <param name="configOverrides">the carrier-specific messaging configuration values to override for
              sending the message.</param>
-        <param name="sentIntent">if not NULL this &lt;code&gt;PendingIntent&lt;/code&gt; is
+        <param name="sentIntent">if not NULL this <c>PendingIntent</c> is
              broadcast when the message is successfully sent, or failed</param>
         <param name="messageId">an id that uniquely identifies the message requested to be sent.
             Used for logging and diagnostics purposes. The id may be 0.</param>
@@ -4305,74 +4305,74 @@
         <param name="destinationAddress">the address to send the message to</param>
         <param name="scAddress">is the service center address or null to use
              the current default SMSC</param>
-        <param name="parts">an &lt;code&gt;ArrayList&lt;/code&gt; of strings that, in order,
+        <param name="parts">an <c>ArrayList</c> of strings that, in order,
              comprise the original message</param>
-        <param name="sentIntents">if not null, an &lt;code&gt;ArrayList&lt;/code&gt; of
-             &lt;code&gt;PendingIntent&lt;/code&gt;s (one for each message part) that is
+        <param name="sentIntents">if not null, an <c>ArrayList</c> of
+             <c>PendingIntent</c>s (one for each message part) that is
              broadcast when the corresponding message part has been sent.
-             The result code will be &lt;code&gt;Activity.RESULT_OK&lt;/code&gt; for success,
+             The result code will be <c>Activity.RESULT_OK</c> for success,
              or one of these errors:&lt;br&gt;
-             &lt;code&gt;RESULT_ERROR_GENERIC_FAILURE&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_ERROR_RADIO_OFF&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_ERROR_NULL_PDU&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_ERROR_NO_SERVICE&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_ERROR_LIMIT_EXCEEDED&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_ERROR_FDN_CHECK_FAILURE&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_ERROR_SHORT_CODE_NOT_ALLOWED&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_ERROR_SHORT_CODE_NEVER_ALLOWED&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RADIO_NOT_AVAILABLE&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_NETWORK_REJECT&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_INVALID_ARGUMENTS&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_INVALID_STATE&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_NO_MEMORY&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_INVALID_SMS_FORMAT&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_SYSTEM_ERROR&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_MODEM_ERROR&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_NETWORK_ERROR&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_ENCODING_ERROR&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_INVALID_SMSC_ADDRESS&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_OPERATION_NOT_ALLOWED&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_INTERNAL_ERROR&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_NO_RESOURCES&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_CANCELLED&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_REQUEST_NOT_SUPPORTED&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_NO_BLUETOOTH_SERVICE&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_INVALID_BLUETOOTH_ADDRESS&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_BLUETOOTH_DISCONNECTED&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_UNEXPECTED_EVENT_STOP_SENDING&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_SMS_BLOCKED_DURING_EMERGENCY&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_SMS_SEND_RETRY_FAILED&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_REMOTE_EXCEPTION&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_NO_DEFAULT_SMS_APP&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RIL_RADIO_NOT_AVAILABLE&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RIL_SMS_SEND_FAIL_RETRY&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RIL_NETWORK_REJECT&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RIL_INVALID_STATE&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RIL_INVALID_ARGUMENTS&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RIL_NO_MEMORY&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RIL_REQUEST_RATE_LIMITED&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RIL_INVALID_SMS_FORMAT&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RIL_SYSTEM_ERR&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RIL_ENCODING_ERR&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RIL_INVALID_SMSC_ADDRESS&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RIL_MODEM_ERR&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RIL_NETWORK_ERR&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RIL_INTERNAL_ERR&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RIL_REQUEST_NOT_SUPPORTED&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RIL_INVALID_MODEM_STATE&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RIL_NETWORK_NOT_READY&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RIL_OPERATION_NOT_ALLOWED&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RIL_NO_RESOURCES&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RIL_CANCELLED&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RIL_SIM_ABSENT&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RIL_SIMULTANEOUS_SMS_AND_CALL_NOT_ALLOWED&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RIL_ACCESS_BARRED&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RIL_BLOCKED_DUE_TO_CALL&lt;/code&gt;&lt;br&gt;
-             For &lt;code&gt;RESULT_ERROR_GENERIC_FAILURE&lt;/code&gt; or any of the RESULT_RIL errors,
+             <c>RESULT_ERROR_GENERIC_FAILURE</c>&lt;br&gt;
+             <c>RESULT_ERROR_RADIO_OFF</c>&lt;br&gt;
+             <c>RESULT_ERROR_NULL_PDU</c>&lt;br&gt;
+             <c>RESULT_ERROR_NO_SERVICE</c>&lt;br&gt;
+             <c>RESULT_ERROR_LIMIT_EXCEEDED</c>&lt;br&gt;
+             <c>RESULT_ERROR_FDN_CHECK_FAILURE</c>&lt;br&gt;
+             <c>RESULT_ERROR_SHORT_CODE_NOT_ALLOWED</c>&lt;br&gt;
+             <c>RESULT_ERROR_SHORT_CODE_NEVER_ALLOWED</c>&lt;br&gt;
+             <c>RESULT_RADIO_NOT_AVAILABLE</c>&lt;br&gt;
+             <c>RESULT_NETWORK_REJECT</c>&lt;br&gt;
+             <c>RESULT_INVALID_ARGUMENTS</c>&lt;br&gt;
+             <c>RESULT_INVALID_STATE</c>&lt;br&gt;
+             <c>RESULT_NO_MEMORY</c>&lt;br&gt;
+             <c>RESULT_INVALID_SMS_FORMAT</c>&lt;br&gt;
+             <c>RESULT_SYSTEM_ERROR</c>&lt;br&gt;
+             <c>RESULT_MODEM_ERROR</c>&lt;br&gt;
+             <c>RESULT_NETWORK_ERROR</c>&lt;br&gt;
+             <c>RESULT_ENCODING_ERROR</c>&lt;br&gt;
+             <c>RESULT_INVALID_SMSC_ADDRESS</c>&lt;br&gt;
+             <c>RESULT_OPERATION_NOT_ALLOWED</c>&lt;br&gt;
+             <c>RESULT_INTERNAL_ERROR</c>&lt;br&gt;
+             <c>RESULT_NO_RESOURCES</c>&lt;br&gt;
+             <c>RESULT_CANCELLED</c>&lt;br&gt;
+             <c>RESULT_REQUEST_NOT_SUPPORTED</c>&lt;br&gt;
+             <c>RESULT_NO_BLUETOOTH_SERVICE</c>&lt;br&gt;
+             <c>RESULT_INVALID_BLUETOOTH_ADDRESS</c>&lt;br&gt;
+             <c>RESULT_BLUETOOTH_DISCONNECTED</c>&lt;br&gt;
+             <c>RESULT_UNEXPECTED_EVENT_STOP_SENDING</c>&lt;br&gt;
+             <c>RESULT_SMS_BLOCKED_DURING_EMERGENCY</c>&lt;br&gt;
+             <c>RESULT_SMS_SEND_RETRY_FAILED</c>&lt;br&gt;
+             <c>RESULT_REMOTE_EXCEPTION</c>&lt;br&gt;
+             <c>RESULT_NO_DEFAULT_SMS_APP</c>&lt;br&gt;
+             <c>RESULT_RIL_RADIO_NOT_AVAILABLE</c>&lt;br&gt;
+             <c>RESULT_RIL_SMS_SEND_FAIL_RETRY</c>&lt;br&gt;
+             <c>RESULT_RIL_NETWORK_REJECT</c>&lt;br&gt;
+             <c>RESULT_RIL_INVALID_STATE</c>&lt;br&gt;
+             <c>RESULT_RIL_INVALID_ARGUMENTS</c>&lt;br&gt;
+             <c>RESULT_RIL_NO_MEMORY</c>&lt;br&gt;
+             <c>RESULT_RIL_REQUEST_RATE_LIMITED</c>&lt;br&gt;
+             <c>RESULT_RIL_INVALID_SMS_FORMAT</c>&lt;br&gt;
+             <c>RESULT_RIL_SYSTEM_ERR</c>&lt;br&gt;
+             <c>RESULT_RIL_ENCODING_ERR</c>&lt;br&gt;
+             <c>RESULT_RIL_INVALID_SMSC_ADDRESS</c>&lt;br&gt;
+             <c>RESULT_RIL_MODEM_ERR</c>&lt;br&gt;
+             <c>RESULT_RIL_NETWORK_ERR</c>&lt;br&gt;
+             <c>RESULT_RIL_INTERNAL_ERR</c>&lt;br&gt;
+             <c>RESULT_RIL_REQUEST_NOT_SUPPORTED</c>&lt;br&gt;
+             <c>RESULT_RIL_INVALID_MODEM_STATE</c>&lt;br&gt;
+             <c>RESULT_RIL_NETWORK_NOT_READY</c>&lt;br&gt;
+             <c>RESULT_RIL_OPERATION_NOT_ALLOWED</c>&lt;br&gt;
+             <c>RESULT_RIL_NO_RESOURCES</c>&lt;br&gt;
+             <c>RESULT_RIL_CANCELLED</c>&lt;br&gt;
+             <c>RESULT_RIL_SIM_ABSENT</c>&lt;br&gt;
+             <c>RESULT_RIL_SIMULTANEOUS_SMS_AND_CALL_NOT_ALLOWED</c>&lt;br&gt;
+             <c>RESULT_RIL_ACCESS_BARRED</c>&lt;br&gt;
+             <c>RESULT_RIL_BLOCKED_DUE_TO_CALL</c>&lt;br&gt;
+             For <c>RESULT_ERROR_GENERIC_FAILURE</c> or any of the RESULT_RIL errors,
              the sentIntent may include the extra "errorCode" containing a radio technology specific
              value, generally only useful for troubleshooting.&lt;br&gt;</param>
-        <param name="deliveryIntents">if not null, an &lt;code&gt;ArrayList&lt;/code&gt; of
-             &lt;code&gt;PendingIntent&lt;/code&gt;s (one for each message part) that is
+        <param name="deliveryIntents">if not null, an <c>ArrayList</c> of
+             <c>PendingIntent</c>s (one for each message part) that is
              broadcast when the corresponding message part has been delivered
              to the recipient.  The raw pdu of the status report is in the
              extended data ("pdu").</param>
@@ -4663,70 +4663,70 @@
         <param name="scAddress">is the service center address or null to use
              the current default SMSC</param>
         <param name="text">the body of the message to send</param>
-        <param name="sentIntent">if not NULL this &lt;code&gt;PendingIntent&lt;/code&gt; is
+        <param name="sentIntent">if not NULL this <c>PendingIntent</c> is
              broadcast when the message is successfully sent, or failed.
-             The result code will be &lt;code&gt;Activity.RESULT_OK&lt;/code&gt; for success,
+             The result code will be <c>Activity.RESULT_OK</c> for success,
              or one of these errors:&lt;br&gt;
-             &lt;code&gt;RESULT_ERROR_GENERIC_FAILURE&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_ERROR_RADIO_OFF&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_ERROR_NULL_PDU&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_ERROR_NO_SERVICE&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_ERROR_LIMIT_EXCEEDED&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_ERROR_FDN_CHECK_FAILURE&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_ERROR_SHORT_CODE_NOT_ALLOWED&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_ERROR_SHORT_CODE_NEVER_ALLOWED&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RADIO_NOT_AVAILABLE&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_NETWORK_REJECT&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_INVALID_ARGUMENTS&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_INVALID_STATE&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_NO_MEMORY&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_INVALID_SMS_FORMAT&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_SYSTEM_ERROR&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_MODEM_ERROR&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_NETWORK_ERROR&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_ENCODING_ERROR&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_INVALID_SMSC_ADDRESS&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_OPERATION_NOT_ALLOWED&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_INTERNAL_ERROR&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_NO_RESOURCES&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_CANCELLED&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_REQUEST_NOT_SUPPORTED&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_NO_BLUETOOTH_SERVICE&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_INVALID_BLUETOOTH_ADDRESS&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_BLUETOOTH_DISCONNECTED&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_UNEXPECTED_EVENT_STOP_SENDING&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_SMS_BLOCKED_DURING_EMERGENCY&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_SMS_SEND_RETRY_FAILED&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_REMOTE_EXCEPTION&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_NO_DEFAULT_SMS_APP&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RIL_RADIO_NOT_AVAILABLE&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RIL_SMS_SEND_FAIL_RETRY&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RIL_NETWORK_REJECT&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RIL_INVALID_STATE&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RIL_INVALID_ARGUMENTS&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RIL_NO_MEMORY&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RIL_REQUEST_RATE_LIMITED&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RIL_INVALID_SMS_FORMAT&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RIL_SYSTEM_ERR&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RIL_ENCODING_ERR&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RIL_INVALID_SMSC_ADDRESS&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RIL_MODEM_ERR&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RIL_NETWORK_ERR&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RIL_INTERNAL_ERR&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RIL_REQUEST_NOT_SUPPORTED&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RIL_INVALID_MODEM_STATE&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RIL_NETWORK_NOT_READY&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RIL_OPERATION_NOT_ALLOWED&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RIL_NO_RESOURCES&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RIL_CANCELLED&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RIL_SIM_ABSENT&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RIL_SIMULTANEOUS_SMS_AND_CALL_NOT_ALLOWED&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RIL_ACCESS_BARRED&lt;/code&gt;&lt;br&gt;
-             &lt;code&gt;RESULT_RIL_BLOCKED_DUE_TO_CALL&lt;/code&gt;&lt;br&gt;
-             For &lt;code&gt;RESULT_ERROR_GENERIC_FAILURE&lt;/code&gt; or any of the RESULT_RIL errors,
+             <c>RESULT_ERROR_GENERIC_FAILURE</c>&lt;br&gt;
+             <c>RESULT_ERROR_RADIO_OFF</c>&lt;br&gt;
+             <c>RESULT_ERROR_NULL_PDU</c>&lt;br&gt;
+             <c>RESULT_ERROR_NO_SERVICE</c>&lt;br&gt;
+             <c>RESULT_ERROR_LIMIT_EXCEEDED</c>&lt;br&gt;
+             <c>RESULT_ERROR_FDN_CHECK_FAILURE</c>&lt;br&gt;
+             <c>RESULT_ERROR_SHORT_CODE_NOT_ALLOWED</c>&lt;br&gt;
+             <c>RESULT_ERROR_SHORT_CODE_NEVER_ALLOWED</c>&lt;br&gt;
+             <c>RESULT_RADIO_NOT_AVAILABLE</c>&lt;br&gt;
+             <c>RESULT_NETWORK_REJECT</c>&lt;br&gt;
+             <c>RESULT_INVALID_ARGUMENTS</c>&lt;br&gt;
+             <c>RESULT_INVALID_STATE</c>&lt;br&gt;
+             <c>RESULT_NO_MEMORY</c>&lt;br&gt;
+             <c>RESULT_INVALID_SMS_FORMAT</c>&lt;br&gt;
+             <c>RESULT_SYSTEM_ERROR</c>&lt;br&gt;
+             <c>RESULT_MODEM_ERROR</c>&lt;br&gt;
+             <c>RESULT_NETWORK_ERROR</c>&lt;br&gt;
+             <c>RESULT_ENCODING_ERROR</c>&lt;br&gt;
+             <c>RESULT_INVALID_SMSC_ADDRESS</c>&lt;br&gt;
+             <c>RESULT_OPERATION_NOT_ALLOWED</c>&lt;br&gt;
+             <c>RESULT_INTERNAL_ERROR</c>&lt;br&gt;
+             <c>RESULT_NO_RESOURCES</c>&lt;br&gt;
+             <c>RESULT_CANCELLED</c>&lt;br&gt;
+             <c>RESULT_REQUEST_NOT_SUPPORTED</c>&lt;br&gt;
+             <c>RESULT_NO_BLUETOOTH_SERVICE</c>&lt;br&gt;
+             <c>RESULT_INVALID_BLUETOOTH_ADDRESS</c>&lt;br&gt;
+             <c>RESULT_BLUETOOTH_DISCONNECTED</c>&lt;br&gt;
+             <c>RESULT_UNEXPECTED_EVENT_STOP_SENDING</c>&lt;br&gt;
+             <c>RESULT_SMS_BLOCKED_DURING_EMERGENCY</c>&lt;br&gt;
+             <c>RESULT_SMS_SEND_RETRY_FAILED</c>&lt;br&gt;
+             <c>RESULT_REMOTE_EXCEPTION</c>&lt;br&gt;
+             <c>RESULT_NO_DEFAULT_SMS_APP</c>&lt;br&gt;
+             <c>RESULT_RIL_RADIO_NOT_AVAILABLE</c>&lt;br&gt;
+             <c>RESULT_RIL_SMS_SEND_FAIL_RETRY</c>&lt;br&gt;
+             <c>RESULT_RIL_NETWORK_REJECT</c>&lt;br&gt;
+             <c>RESULT_RIL_INVALID_STATE</c>&lt;br&gt;
+             <c>RESULT_RIL_INVALID_ARGUMENTS</c>&lt;br&gt;
+             <c>RESULT_RIL_NO_MEMORY</c>&lt;br&gt;
+             <c>RESULT_RIL_REQUEST_RATE_LIMITED</c>&lt;br&gt;
+             <c>RESULT_RIL_INVALID_SMS_FORMAT</c>&lt;br&gt;
+             <c>RESULT_RIL_SYSTEM_ERR</c>&lt;br&gt;
+             <c>RESULT_RIL_ENCODING_ERR</c>&lt;br&gt;
+             <c>RESULT_RIL_INVALID_SMSC_ADDRESS</c>&lt;br&gt;
+             <c>RESULT_RIL_MODEM_ERR</c>&lt;br&gt;
+             <c>RESULT_RIL_NETWORK_ERR</c>&lt;br&gt;
+             <c>RESULT_RIL_INTERNAL_ERR</c>&lt;br&gt;
+             <c>RESULT_RIL_REQUEST_NOT_SUPPORTED</c>&lt;br&gt;
+             <c>RESULT_RIL_INVALID_MODEM_STATE</c>&lt;br&gt;
+             <c>RESULT_RIL_NETWORK_NOT_READY</c>&lt;br&gt;
+             <c>RESULT_RIL_OPERATION_NOT_ALLOWED</c>&lt;br&gt;
+             <c>RESULT_RIL_NO_RESOURCES</c>&lt;br&gt;
+             <c>RESULT_RIL_CANCELLED</c>&lt;br&gt;
+             <c>RESULT_RIL_SIM_ABSENT</c>&lt;br&gt;
+             <c>RESULT_RIL_SIMULTANEOUS_SMS_AND_CALL_NOT_ALLOWED</c>&lt;br&gt;
+             <c>RESULT_RIL_ACCESS_BARRED</c>&lt;br&gt;
+             <c>RESULT_RIL_BLOCKED_DUE_TO_CALL</c>&lt;br&gt;
+             For <c>RESULT_ERROR_GENERIC_FAILURE</c> or any of the RESULT_RIL errors,
              the sentIntent may include the extra "errorCode" containing a radio technology specific
              value, generally only useful for troubleshooting.&lt;br&gt;</param>
-        <param name="deliveryIntent">if not NULL this &lt;code&gt;PendingIntent&lt;/code&gt; is
+        <param name="deliveryIntent">if not NULL this <c>PendingIntent</c> is
              broadcast when the message is delivered to the recipient.  The
              raw pdu of the status report is in the extended data ("pdu").</param>
         <summary>Send a text based SMS.</summary>
diff --git a/docs/Mono.Android/en/Android.Telephony/SmsMessage.xml b/docs/Mono.Android/en/Android.Telephony/SmsMessage.xml
index d21be913d8..5edadce134 100644
--- a/docs/Mono.Android/en/Android.Telephony/SmsMessage.xml
+++ b/docs/Mono.Android/en/Android.Telephony/SmsMessage.xml
@@ -1052,7 +1052,7 @@
         <ReturnType>System.Boolean</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Returns true iff the &lt;code&gt;TP-Reply-Path&lt;/code&gt; bit is set in
+        <summary>Returns true iff the <c>TP-Reply-Path</c> bit is set in
             this message.</summary>
         <value>To be added.</value>
         <remarks>
diff --git a/docs/Mono.Android/en/Android.Telephony/SubscriptionInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Telephony/SubscriptionInfo+InterfaceConsts.xml
index c921d6fb59..cd03d745d1 100644
--- a/docs/Mono.Android/en/Android.Telephony/SubscriptionInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Telephony/SubscriptionInfo+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Telephony/SubscriptionPlan+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Telephony/SubscriptionPlan+InterfaceConsts.xml
index 9d215fca5c..f9f96b34eb 100644
--- a/docs/Mono.Android/en/Android.Telephony/SubscriptionPlan+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Telephony/SubscriptionPlan+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Telephony/TelephonyDisplayInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Telephony/TelephonyDisplayInfo+InterfaceConsts.xml
index 2ac1c2a117..412aea97a5 100644
--- a/docs/Mono.Android/en/Android.Telephony/TelephonyDisplayInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Telephony/TelephonyDisplayInfo+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Telephony/UiccCardInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Telephony/UiccCardInfo+InterfaceConsts.xml
index fb6b02dd68..37606b060e 100644
--- a/docs/Mono.Android/en/Android.Telephony/UiccCardInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Telephony/UiccCardInfo+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Telephony/VisualVoicemailSms+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Telephony/VisualVoicemailSms+InterfaceConsts.xml
index 17ff90b605..7d8344cf0f 100644
--- a/docs/Mono.Android/en/Android.Telephony/VisualVoicemailSms+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Telephony/VisualVoicemailSms+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Telephony/VisualVoicemailSmsFilterSettings+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Telephony/VisualVoicemailSmsFilterSettings+InterfaceConsts.xml
index 886a350f31..277093a93a 100644
--- a/docs/Mono.Android/en/Android.Telephony/VisualVoicemailSmsFilterSettings+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Telephony/VisualVoicemailSmsFilterSettings+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Test/ViewAsserts.xml b/docs/Mono.Android/en/Android.Test/ViewAsserts.xml
index 3a413edf09..257a82364a 100644
--- a/docs/Mono.Android/en/Android.Test/ViewAsserts.xml
+++ b/docs/Mono.Android/en/Android.Test/ViewAsserts.xml
@@ -388,8 +388,8 @@
       <Docs>
         <param name="reference">The reference view</param>
         <param name="test">The view that should be center aligned with the reference view</param>
-        <summary>Assert that the &lt;code&gt;test&lt;/code&gt; view is horizontally center aligned
-            with respect to the &lt;code&gt;reference&lt;/code&gt; view.</summary>
+        <summary>Assert that the <c>test</c> view is horizontally center aligned
+            with respect to the <c>reference</c> view.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -821,8 +821,8 @@
       <Docs>
         <param name="reference">The reference view</param>
         <param name="test">The view that should be center aligned with the reference view</param>
-        <summary>Assert that the &lt;code&gt;test&lt;/code&gt; view is vertically center aligned
-            with respect to the &lt;code&gt;reference&lt;/code&gt; view.</summary>
+        <summary>Assert that the <c>test</c> view is vertically center aligned
+            with respect to the <c>reference</c> view.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Text.Method/CharacterPickerDialog.xml b/docs/Mono.Android/en/Android.Text.Method/CharacterPickerDialog.xml
index e834e320c9..5d22082e4e 100644
--- a/docs/Mono.Android/en/Android.Text.Method/CharacterPickerDialog.xml
+++ b/docs/Mono.Android/en/Android.Text.Method/CharacterPickerDialog.xml
@@ -103,8 +103,8 @@
         <param name="options">To be added.</param>
         <param name="insert">To be added.</param>
         <summary>Creates a new CharacterPickerDialog that presents the specified
-            &lt;code&gt;options&lt;/code&gt; for insertion or replacement (depending on
-            the sense of &lt;code&gt;insert&lt;/code&gt;) into &lt;code&gt;text&lt;/code&gt;.</summary>
+            <c>options</c> for insertion or replacement (depending on
+            the sense of <c>insert</c>) into <c>text</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Text.Method/QwertyKeyListener.xml b/docs/Mono.Android/en/Android.Text.Method/QwertyKeyListener.xml
index 417904fa74..1bb51902f0 100644
--- a/docs/Mono.Android/en/Android.Text.Method/QwertyKeyListener.xml
+++ b/docs/Mono.Android/en/Android.Text.Method/QwertyKeyListener.xml
@@ -260,8 +260,8 @@
         <param name="start">the start of the replaced region</param>
         <param name="end">the end of the replaced region; the location of the cursor</param>
         <param name="original">the text to be restored if the user presses DEL</param>
-        <summary>Marks the specified region of &lt;code&gt;content&lt;/code&gt; as having
-            contained &lt;code&gt;original&lt;/code&gt; prior to AutoText replacement.</summary>
+        <summary>Marks the specified region of <c>content</c> as having
+            contained <c>original</c> prior to AutoText replacement.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Text.Style/AbsoluteSizeSpan+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Text.Style/AbsoluteSizeSpan+InterfaceConsts.xml
index d692640611..cb9a88ce77 100644
--- a/docs/Mono.Android/en/Android.Text.Style/AbsoluteSizeSpan+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Text.Style/AbsoluteSizeSpan+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Text.Style/AbsoluteSizeSpan.xml b/docs/Mono.Android/en/Android.Text.Style/AbsoluteSizeSpan.xml
index a65d4023d9..30b35c0870 100644
--- a/docs/Mono.Android/en/Android.Text.Style/AbsoluteSizeSpan.xml
+++ b/docs/Mono.Android/en/Android.Text.Style/AbsoluteSizeSpan.xml
@@ -107,7 +107,7 @@
       </Parameters>
       <Docs>
         <param name="size">To be added.</param>
-        <summary>Set the text size to &lt;code&gt;size&lt;/code&gt; physical pixels.</summary>
+        <summary>Set the text size to <c>size</c> physical pixels.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -146,8 +146,8 @@
       <Docs>
         <param name="size">To be added.</param>
         <param name="dip">To be added.</param>
-        <summary>Set the text size to &lt;code&gt;size&lt;/code&gt; physical pixels, or to &lt;code&gt;size&lt;/code&gt;
-            device-independent pixels if &lt;code&gt;dip&lt;/code&gt; is true.</summary>
+        <summary>Set the text size to <c>size</c> physical pixels, or to <c>size</c>
+            device-independent pixels if <c>dip</c> is true.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -240,8 +240,9 @@
       </ReturnValue>
       <Docs>
         <summary>Returns whether the size is in device-independent pixels or not, depending on the
-            &lt;code&gt;dip&lt;/code&gt; flag passed in <c>#AbsoluteSizeSpan(int, boolean)</c></summary>
-        <value>&lt;code&gt;true&lt;/code&gt; if the size is in device-independent pixels, &lt;code&gt;false&lt;/code&gt;
+            <c>dip</c> flag passed in <c>#AbsoluteSizeSpan(int, boolean)</c></summary>
+        <value>
+          <c>true</c> if the size is in device-independent pixels, <c>false</c>
             otherwise</value>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Text.Style/AlignmentSpanStandard+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Text.Style/AlignmentSpanStandard+InterfaceConsts.xml
index 9a1677b4d0..26387de74d 100644
--- a/docs/Mono.Android/en/Android.Text.Style/AlignmentSpanStandard+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Text.Style/AlignmentSpanStandard+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Text.Style/BackgroundColorSpan+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Text.Style/BackgroundColorSpan+InterfaceConsts.xml
index 0b647b6fd0..e241ea4cd6 100644
--- a/docs/Mono.Android/en/Android.Text.Style/BackgroundColorSpan+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Text.Style/BackgroundColorSpan+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Text.Style/BulletSpan+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Text.Style/BulletSpan+InterfaceConsts.xml
index a7014a46ec..a33abb0b68 100644
--- a/docs/Mono.Android/en/Android.Text.Style/BulletSpan+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Text.Style/BulletSpan+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Text.Style/EasyEditSpan+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Text.Style/EasyEditSpan+InterfaceConsts.xml
index a18c76badd..6e8eb931f0 100644
--- a/docs/Mono.Android/en/Android.Text.Style/EasyEditSpan+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Text.Style/EasyEditSpan+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Text.Style/ForegroundColorSpan+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Text.Style/ForegroundColorSpan+InterfaceConsts.xml
index a52ff15651..1511923fbf 100644
--- a/docs/Mono.Android/en/Android.Text.Style/ForegroundColorSpan+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Text.Style/ForegroundColorSpan+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Text.Style/ImageSpan.xml b/docs/Mono.Android/en/Android.Text.Style/ImageSpan.xml
index 6e175e401e..21aacce6af 100644
--- a/docs/Mono.Android/en/Android.Text.Style/ImageSpan.xml
+++ b/docs/Mono.Android/en/Android.Text.Style/ImageSpan.xml
@@ -135,8 +135,7 @@
         <Parameter Name="bitmap" Type="Android.Graphics.Bitmap" />
       </Parameters>
       <Docs>
-        <param name="context">context used to create a drawable from {</param>
-        <param name="bitmap}}">based on the display
+        <param name="context">context used to create a drawable from <paramref>bitmap</paramref> based on the display
                            metrics of the resources</param>
         <param name="bitmap">bitmap to be rendered</param>
         <summary>Constructs an <c>ImageSpan</c> from a <c>Context</c> and a <c>Bitmap</c> with the default
@@ -177,8 +176,7 @@
         <Parameter Name="uri" Type="Android.Net.Uri" />
       </Parameters>
       <Docs>
-        <param name="context">context used to create a drawable from {</param>
-        <param name="bitmap}}">based on the display
+        <param name="context">context used to create a drawable from <paramref>bitmap</paramref> based on the display
                            metrics of the resources</param>
         <param name="uri">
           <c>Uri</c> used to construct the drawable that will be rendered</param>
@@ -429,8 +427,7 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="context">context used to create a drawable from {</param>
-        <param name="bitmap}}">based on
+        <param name="context">context used to create a drawable from <paramref>bitmap</paramref> based on
                                      the display metrics of the resources</param>
         <param name="bitmap">bitmap to be rendered</param>
         <param name="verticalAlignment">one of <c>DynamicDrawableSpan#ALIGN_BOTTOM</c> or
@@ -481,8 +478,7 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="context">context used to create a drawable from {</param>
-        <param name="bitmap}}">based on
+        <param name="context">context used to create a drawable from <paramref>bitmap</paramref> based on
                                      the display
                                      metrics of the resources</param>
         <param name="uri">
diff --git a/docs/Mono.Android/en/Android.Text.Style/LeadingMarginSpanStandard+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Text.Style/LeadingMarginSpanStandard+InterfaceConsts.xml
index 1413d2f417..80f0908d2f 100644
--- a/docs/Mono.Android/en/Android.Text.Style/LeadingMarginSpanStandard+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Text.Style/LeadingMarginSpanStandard+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Text.Style/LineBackgroundSpanStandard+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Text.Style/LineBackgroundSpanStandard+InterfaceConsts.xml
index 87a4fb514b..df6559bac2 100644
--- a/docs/Mono.Android/en/Android.Text.Style/LineBackgroundSpanStandard+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Text.Style/LineBackgroundSpanStandard+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Text.Style/LineHeightSpanStandard+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Text.Style/LineHeightSpanStandard+InterfaceConsts.xml
index 3e5bef2423..7ca89bba87 100644
--- a/docs/Mono.Android/en/Android.Text.Style/LineHeightSpanStandard+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Text.Style/LineHeightSpanStandard+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Text.Style/LineHeightSpanStandard.xml b/docs/Mono.Android/en/Android.Text.Style/LineHeightSpanStandard.xml
index 38a3dd1577..965ba5d110 100644
--- a/docs/Mono.Android/en/Android.Text.Style/LineHeightSpanStandard.xml
+++ b/docs/Mono.Android/en/Android.Text.Style/LineHeightSpanStandard.xml
@@ -116,7 +116,7 @@
       </Parameters>
       <Docs>
         <param name="height">To be added.</param>
-        <summary>Set the line height of the paragraph to &lt;code&gt;height&lt;/code&gt; physical pixels.</summary>
+        <summary>Set the line height of the paragraph to <c>height</c> physical pixels.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Text.Style/LocaleSpan+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Text.Style/LocaleSpan+InterfaceConsts.xml
index 8e97bef750..028ba49ff6 100644
--- a/docs/Mono.Android/en/Android.Text.Style/LocaleSpan+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Text.Style/LocaleSpan+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Text.Style/MaskFilterSpan.xml b/docs/Mono.Android/en/Android.Text.Style/MaskFilterSpan.xml
index 7a46b887d4..2eacbd899c 100644
--- a/docs/Mono.Android/en/Android.Text.Style/MaskFilterSpan.xml
+++ b/docs/Mono.Android/en/Android.Text.Style/MaskFilterSpan.xml
@@ -66,7 +66,7 @@
         <Parameter Name="filter" Type="Android.Graphics.MaskFilter" />
       </Parameters>
       <Docs>
-        <param name="filter">the filter to be applied to the &lt;code&gt;TextPaint&lt;/code&gt;</param>
+        <param name="filter">the filter to be applied to the <c>TextPaint</c></param>
         <summary>Creates a <c>MaskFilterSpan</c> from a <c>MaskFilter</c>.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Text.Style/QuoteSpan+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Text.Style/QuoteSpan+InterfaceConsts.xml
index 048ae81bc0..c6b33b4da9 100644
--- a/docs/Mono.Android/en/Android.Text.Style/QuoteSpan+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Text.Style/QuoteSpan+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Text.Style/RelativeSizeSpan+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Text.Style/RelativeSizeSpan+InterfaceConsts.xml
index 23b6ccdd54..ff248a03be 100644
--- a/docs/Mono.Android/en/Android.Text.Style/RelativeSizeSpan+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Text.Style/RelativeSizeSpan+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Text.Style/ScaleXSpan+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Text.Style/ScaleXSpan+InterfaceConsts.xml
index 6e457b955d..c46d2b9a97 100644
--- a/docs/Mono.Android/en/Android.Text.Style/ScaleXSpan+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Text.Style/ScaleXSpan+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Text.Style/StrikethroughSpan+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Text.Style/StrikethroughSpan+InterfaceConsts.xml
index 4b74336f50..74ce558e2b 100644
--- a/docs/Mono.Android/en/Android.Text.Style/StrikethroughSpan+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Text.Style/StrikethroughSpan+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Text.Style/StyleSpan+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Text.Style/StyleSpan+InterfaceConsts.xml
index 596e142831..da603b47d6 100644
--- a/docs/Mono.Android/en/Android.Text.Style/StyleSpan+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Text.Style/StyleSpan+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Text.Style/SubscriptSpan+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Text.Style/SubscriptSpan+InterfaceConsts.xml
index 744e1f2135..9a195b2ba4 100644
--- a/docs/Mono.Android/en/Android.Text.Style/SubscriptSpan+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Text.Style/SubscriptSpan+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Text.Style/SuggestionSpan+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Text.Style/SuggestionSpan+InterfaceConsts.xml
index facfbe5591..6f614077eb 100644
--- a/docs/Mono.Android/en/Android.Text.Style/SuggestionSpan+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Text.Style/SuggestionSpan+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Text.Style/SuperscriptSpan+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Text.Style/SuperscriptSpan+InterfaceConsts.xml
index 6fb705ca42..625fddf033 100644
--- a/docs/Mono.Android/en/Android.Text.Style/SuperscriptSpan+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Text.Style/SuperscriptSpan+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Text.Style/TextAppearanceSpan+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Text.Style/TextAppearanceSpan+InterfaceConsts.xml
index 2523425a31..173279cc79 100644
--- a/docs/Mono.Android/en/Android.Text.Style/TextAppearanceSpan+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Text.Style/TextAppearanceSpan+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Text.Style/TextAppearanceSpan.xml b/docs/Mono.Android/en/Android.Text.Style/TextAppearanceSpan.xml
index f5218abb8b..409df1629c 100644
--- a/docs/Mono.Android/en/Android.Text.Style/TextAppearanceSpan.xml
+++ b/docs/Mono.Android/en/Android.Text.Style/TextAppearanceSpan.xml
@@ -301,7 +301,7 @@
         <ReturnType>System.String</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Returns the typeface family specified by this span, or &lt;code&gt;null&lt;/code&gt;
+        <summary>Returns the typeface family specified by this span, or <c>null</c>
             if it does not specify one.</summary>
         <value>To be added.</value>
         <remarks>
@@ -339,7 +339,7 @@
         <ReturnType>System.String</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Returns the font feature settings specified by this span, or &lt;code&gt;null&lt;/code&gt;
+        <summary>Returns the font feature settings specified by this span, or <c>null</c>
             if it does not specify one.</summary>
         <value>To be added.</value>
         <remarks>
@@ -376,7 +376,7 @@
         <ReturnType>System.String</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Returns the font variation settings specified by this span, or &lt;code&gt;null&lt;/code&gt;
+        <summary>Returns the font variation settings specified by this span, or <c>null</c>
             if it does not specify one.</summary>
         <value>To be added.</value>
         <remarks>
@@ -414,7 +414,7 @@
       </ReturnValue>
       <Docs>
         <summary>Returns the value of elegant height metrics flag specified by this span,
-            or &lt;code&gt;false&lt;/code&gt; if it does not specify one.</summary>
+            or <c>false</c> if it does not specify one.</summary>
         <value>To be added.</value>
         <remarks>
           <para>
@@ -484,7 +484,7 @@
         <ReturnType>Android.Content.Res.ColorStateList</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Returns the link color specified by this span, or &lt;code&gt;null&lt;/code&gt;
+        <summary>Returns the link color specified by this span, or <c>null</c>
             if it does not specify one.</summary>
         <value>To be added.</value>
         <remarks>
@@ -522,7 +522,7 @@
         <ReturnType>System.Int32</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Returns the color of the text shadow specified by this span, or &lt;code&gt;0&lt;/code&gt;
+        <summary>Returns the color of the text shadow specified by this span, or <c>0</c>
             if it does not specify one.</summary>
         <value>To be added.</value>
         <remarks>
@@ -559,7 +559,8 @@
         <ReturnType>System.Single</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Returns the horizontal offset of the text shadow specified by this span, or &lt;code&gt;0.</summary>
+        <summary>Returns the horizontal offset of the text shadow specified by this span, or <c>0.0f</c>
+            if it does not specify one.</summary>
         <value>To be added.</value>
         <remarks>
           <para>
@@ -595,7 +596,8 @@
         <ReturnType>System.Single</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Returns the vertical offset of the text shadow specified by this span, or &lt;code&gt;0.</summary>
+        <summary>Returns the vertical offset of the text shadow specified by this span, or <c>0.0f</c>
+            if it does not specify one.</summary>
         <value>To be added.</value>
         <remarks>
           <para>
@@ -631,7 +633,8 @@
         <ReturnType>System.Single</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Returns the blur radius of the text shadow specified by this span, or &lt;code&gt;0.</summary>
+        <summary>Returns the blur radius of the text shadow specified by this span, or <c>0.0f</c>
+            if it does not specify one.</summary>
         <value>To be added.</value>
         <remarks>
           <para>
@@ -698,7 +701,7 @@
         <ReturnType>Android.Content.Res.ColorStateList</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Returns the text color specified by this span, or &lt;code&gt;null&lt;/code&gt;
+        <summary>Returns the text color specified by this span, or <c>null</c>
             if it does not specify one.</summary>
         <value>To be added.</value>
         <remarks>
@@ -736,7 +739,7 @@
         <ReturnType>System.Int32</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Returns the text font weight specified by this span, or &lt;code&gt;-1&lt;/code&gt;
+        <summary>Returns the text font weight specified by this span, or <c>-1</c>
             if it does not specify one.</summary>
         <value>To be added.</value>
         <remarks>
@@ -773,7 +776,7 @@
         <ReturnType>Android.OS.LocaleList</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Returns the <c>android.os.LocaleList</c> specified by this span, or &lt;code&gt;null&lt;/code&gt;
+        <summary>Returns the <c>android.os.LocaleList</c> specified by this span, or <c>null</c>
             if it does not specify one.</summary>
         <value>To be added.</value>
         <remarks>
@@ -810,7 +813,7 @@
         <ReturnType>System.Int32</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Returns the text size specified by this span, or &lt;code&gt;-1&lt;/code&gt;
+        <summary>Returns the text size specified by this span, or <c>-1</c>
             if it does not specify one.</summary>
         <value>To be added.</value>
         <remarks>
@@ -848,7 +851,7 @@
         <ReturnType>Android.Graphics.TypefaceStyle</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Returns the text style specified by this span, or &lt;code&gt;0&lt;/code&gt;
+        <summary>Returns the text style specified by this span, or <c>0</c>
             if it does not specify one.</summary>
         <value>To be added.</value>
         <remarks>
@@ -948,7 +951,7 @@
         <ReturnType>Android.Graphics.Typeface</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Returns the typeface specified by this span, or &lt;code&gt;null&lt;/code&gt;
+        <summary>Returns the typeface specified by this span, or <c>null</c>
             if it does not specify one.</summary>
         <value>To be added.</value>
         <remarks>
diff --git a/docs/Mono.Android/en/Android.Text.Style/TtsSpan+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Text.Style/TtsSpan+InterfaceConsts.xml
index da74cacba7..dbe0a27e12 100644
--- a/docs/Mono.Android/en/Android.Text.Style/TtsSpan+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Text.Style/TtsSpan+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Text.Style/TypefaceSpan+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Text.Style/TypefaceSpan+InterfaceConsts.xml
index eacc587398..7b7c98f194 100644
--- a/docs/Mono.Android/en/Android.Text.Style/TypefaceSpan+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Text.Style/TypefaceSpan+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Text.Style/URLSpan+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Text.Style/URLSpan+InterfaceConsts.xml
index 9b26f99e94..8bbddff3b9 100644
--- a/docs/Mono.Android/en/Android.Text.Style/URLSpan+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Text.Style/URLSpan+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Text.Style/UnderlineSpan+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Text.Style/UnderlineSpan+InterfaceConsts.xml
index bfea757a3a..4c56d89570 100644
--- a/docs/Mono.Android/en/Android.Text.Style/UnderlineSpan+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Text.Style/UnderlineSpan+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Text.Util/Linkify.xml b/docs/Mono.Android/en/Android.Text.Util/Linkify.xml
index 49fa197fa1..0f4b5ad438 100644
--- a/docs/Mono.Android/en/Android.Text.Util/Linkify.xml
+++ b/docs/Mono.Android/en/Android.Text.Util/Linkify.xml
@@ -264,7 +264,7 @@
       <Docs>
         <param name="text">Spannable whose text is to be marked-up with links</param>
         <param name="pattern">Regex pattern to be used for finding links</param>
-        <param name="scheme">URL scheme string (eg &lt;code&gt;http://&lt;/code&gt;) to be
+        <param name="scheme">URL scheme string (eg <c>http://</c>) to be
                                  prepended to the links that do not start with this scheme.</param>
         <summary>Applies a regex to a Spannable turning the matches into
              links.</summary>
@@ -311,7 +311,7 @@
       <Docs>
         <param name="text">TextView whose text is to be marked-up with links</param>
         <param name="pattern">Regex pattern to be used for finding links</param>
-        <param name="scheme">URL scheme string (eg &lt;code&gt;http://&lt;/code&gt;) to be
+        <param name="scheme">URL scheme string (eg <c>http://</c>) to be
                                  prepended to the links that do not start with this scheme.</param>
         <summary>Applies a regex to the text of a TextView turning the matches into
              links.</summary>
diff --git a/docs/Mono.Android/en/Android.Text/AlteredCharSequence.xml b/docs/Mono.Android/en/Android.Text/AlteredCharSequence.xml
index bcab015a72..02c95fde26 100644
--- a/docs/Mono.Android/en/Android.Text/AlteredCharSequence.xml
+++ b/docs/Mono.Android/en/Android.Text/AlteredCharSequence.xml
@@ -306,9 +306,9 @@
         <param name="substart">To be added.</param>
         <param name="subend">To be added.</param>
         <summary>Create an AlteredCharSequence whose text (and possibly spans)
-            are mirrored from &lt;code&gt;source&lt;/code&gt;, except that the range of
-            offsets &lt;code&gt;substart&lt;/code&gt; inclusive to &lt;code&gt;subend&lt;/code&gt; exclusive
-            are mirrored instead from &lt;code&gt;sub&lt;/code&gt;, beginning at offset 0.</summary>
+            are mirrored from <c>source</c>, except that the range of
+            offsets <c>substart</c> inclusive to <c>subend</c> exclusive
+            are mirrored instead from <c>sub</c>, beginning at offset 0.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
@@ -356,9 +356,9 @@
         <param name="substart">To be added.</param>
         <param name="subend">To be added.</param>
         <summary>Create an AlteredCharSequence whose text (and possibly spans)
-            are mirrored from &lt;code&gt;source&lt;/code&gt;, except that the range of
-            offsets &lt;code&gt;substart&lt;/code&gt; inclusive to &lt;code&gt;subend&lt;/code&gt; exclusive
-            are mirrored instead from &lt;code&gt;sub&lt;/code&gt;, beginning at offset 0.</summary>
+            are mirrored from <c>source</c>, except that the range of
+            offsets <c>substart</c> inclusive to <c>subend</c> exclusive
+            are mirrored instead from <c>sub</c>, beginning at offset 0.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Text/AndroidCharacter.xml b/docs/Mono.Android/en/Android.Text/AndroidCharacter.xml
index 5a481b047c..195e947c27 100644
--- a/docs/Mono.Android/en/Android.Text/AndroidCharacter.xml
+++ b/docs/Mono.Android/en/Android.Text/AndroidCharacter.xml
@@ -321,8 +321,8 @@
         <param name="src">To be added.</param>
         <param name="dest">To be added.</param>
         <param name="count">To be added.</param>
-        <summary>Fill in the first &lt;code&gt;count&lt;/code&gt; bytes of &lt;code&gt;dest&lt;/code&gt; with the
-            directionalities from the first &lt;code&gt;count&lt;/code&gt; chars of &lt;code&gt;src&lt;/code&gt;.</summary>
+        <summary>Fill in the first <c>count</c> bytes of <c>dest</c> with the
+            directionalities from the first <c>count</c> chars of <c>src</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -418,9 +418,9 @@
         <param name="start">first character in array to measure</param>
         <param name="count">maximum number of characters to measure</param>
         <param name="dest">byte array of results for each character in src</param>
-        <summary>Fill the first &lt;code&gt;count&lt;/code&gt; bytes of &lt;code&gt;dest&lt;/code&gt; with the
-            East Asian Width from &lt;code&gt;count&lt;/code&gt; chars of &lt;code&gt;src&lt;/code&gt;
-            starting at &lt;code&gt;start&lt;/code&gt;.</summary>
+        <summary>Fill the first <c>count</c> bytes of <c>dest</c> with the
+            East Asian Width from <c>count</c> chars of <c>src</c>
+            starting at <c>start</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -545,7 +545,7 @@
         <param name="text">array of characters to apply mirror operation</param>
         <param name="start">first character in array to mirror</param>
         <param name="count">maximum number of characters to mirror</param>
-        <summary>Replace the specified slice of &lt;code&gt;text&lt;/code&gt; with the chars'
+        <summary>Replace the specified slice of <c>text</c> with the chars'
             right-to-left mirrors (if any), returning true if any
             replacements were made.</summary>
         <returns>true if replacements were made</returns>
diff --git a/docs/Mono.Android/en/Android.Text/Annotation+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Text/Annotation+InterfaceConsts.xml
index cc4408e9aa..4d31d05664 100644
--- a/docs/Mono.Android/en/Android.Text/Annotation+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Text/Annotation+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Text/IEditable.xml b/docs/Mono.Android/en/Android.Text/IEditable.xml
index c47bf9e35c..9b0478356a 100644
--- a/docs/Mono.Android/en/Android.Text/IEditable.xml
+++ b/docs/Mono.Android/en/Android.Text/IEditable.xml
@@ -534,9 +534,9 @@
         <param name="source">To be added.</param>
         <param name="start">To be added.</param>
         <param name="end">To be added.</param>
-        <summary>Replaces the specified range (&lt;code&gt;st&amp;hellip;en&lt;/code&gt;) of text in this
-            Editable with a copy of the slice &lt;code&gt;start&amp;hellip;end&lt;/code&gt; from
-            &lt;code&gt;source&lt;/code&gt;.</summary>
+        <summary>Replaces the specified range (<c>st&amp;hellip;en</c>) of text in this
+            Editable with a copy of the slice <c>start&amp;hellip;end</c> from
+            <c>source</c>.</summary>
         <returns>a reference to this object.</returns>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Text/IInputFilter.xml b/docs/Mono.Android/en/Android.Text/IInputFilter.xml
index ac57998d9d..a24f334754 100644
--- a/docs/Mono.Android/en/Android.Text/IInputFilter.xml
+++ b/docs/Mono.Android/en/Android.Text/IInputFilter.xml
@@ -77,9 +77,9 @@
         <param name="dstart">To be added.</param>
         <param name="dend">To be added.</param>
         <summary>This method is called when the buffer is going to replace the
-            range &lt;code&gt;dstart &amp;hellip; dend&lt;/code&gt; of &lt;code&gt;dest&lt;/code&gt;
-            with the new text from the range &lt;code&gt;start &amp;hellip; end&lt;/code&gt;
-            of &lt;code&gt;source&lt;/code&gt;.</summary>
+            range <c>dstart &amp;hellip; dend</c> of <c>dest</c>
+            with the new text from the range <c>start &amp;hellip; end</c>
+            of <c>source</c>.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Text/ISpanWatcher.xml b/docs/Mono.Android/en/Android.Text/ISpanWatcher.xml
index 2eaf388efa..8b462b8de4 100644
--- a/docs/Mono.Android/en/Android.Text/ISpanWatcher.xml
+++ b/docs/Mono.Android/en/Android.Text/ISpanWatcher.xml
@@ -128,8 +128,8 @@
         <param name="nstart">To be added.</param>
         <param name="nend">To be added.</param>
         <summary>This method is called to notify you that the specified object
-            has been relocated from the range &lt;code&gt;ostart&amp;hellip;oend&lt;/code&gt;
-            to the new range &lt;code&gt;nstart&amp;hellip;nend&lt;/code&gt; of the text.</summary>
+            has been relocated from the range <c>ostart&amp;hellip;oend</c>
+            to the new range <c>nstart&amp;hellip;nend</c> of the text.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Text/ISpannable.xml b/docs/Mono.Android/en/Android.Text/ISpannable.xml
index 4b8c2ace77..9d0e13cc2e 100644
--- a/docs/Mono.Android/en/Android.Text/ISpannable.xml
+++ b/docs/Mono.Android/en/Android.Text/ISpannable.xml
@@ -132,7 +132,7 @@
         <param name="start">To be added.</param>
         <param name="end">To be added.</param>
         <param name="flags">To be added.</param>
-        <summary>Attach the specified markup object to the range &lt;code&gt;start&amp;hellip;end&lt;/code&gt;
+        <summary>Attach the specified markup object to the range <c>start&amp;hellip;end</c>
             of the text, or move the object to that range if it was already
             attached elsewhere.</summary>
         <remarks>
diff --git a/docs/Mono.Android/en/Android.Text/ISpanned.xml b/docs/Mono.Android/en/Android.Text/ISpanned.xml
index 37c329dc37..1e434bd6c1 100644
--- a/docs/Mono.Android/en/Android.Text/ISpanned.xml
+++ b/docs/Mono.Android/en/Android.Text/ISpanned.xml
@@ -262,10 +262,10 @@
         <param name="start">To be added.</param>
         <param name="limit">To be added.</param>
         <param name="type">To be added.</param>
-        <summary>Return the first offset greater than &lt;code&gt;start&lt;/code&gt; where a markup
-            object of class &lt;code&gt;type&lt;/code&gt; begins or ends, or &lt;code&gt;limit&lt;/code&gt;
-            if there are no starts or ends greater than &lt;code&gt;start&lt;/code&gt; but less
-            than &lt;code&gt;limit&lt;/code&gt;.</summary>
+        <summary>Return the first offset greater than <c>start</c> where a markup
+            object of class <c>type</c> begins or ends, or <c>limit</c>
+            if there are no starts or ends greater than <c>start</c> but less
+            than <c>limit</c>.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Text/ITextWatcher.xml b/docs/Mono.Android/en/Android.Text/ITextWatcher.xml
index 62aee1ef75..fe853b797c 100644
--- a/docs/Mono.Android/en/Android.Text/ITextWatcher.xml
+++ b/docs/Mono.Android/en/Android.Text/ITextWatcher.xml
@@ -70,7 +70,7 @@
       <Docs>
         <param name="s">To be added.</param>
         <summary>This method is called to notify you that, somewhere within
-            &lt;code&gt;s&lt;/code&gt;, the text has been changed.</summary>
+            <c>s</c>, the text has been changed.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -116,9 +116,9 @@
         <param name="start">To be added.</param>
         <param name="count">To be added.</param>
         <param name="after">To be added.</param>
-        <summary>This method is called to notify you that, within &lt;code&gt;s&lt;/code&gt;,
-            the &lt;code&gt;count&lt;/code&gt; characters beginning at &lt;code&gt;start&lt;/code&gt;
-            are about to be replaced by new text with length &lt;code&gt;after&lt;/code&gt;.</summary>
+        <summary>This method is called to notify you that, within <c>s</c>,
+            the <c>count</c> characters beginning at <c>start</c>
+            are about to be replaced by new text with length <c>after</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -164,9 +164,9 @@
         <param name="start">To be added.</param>
         <param name="before">To be added.</param>
         <param name="count">To be added.</param>
-        <summary>This method is called to notify you that, within &lt;code&gt;s&lt;/code&gt;,
-            the &lt;code&gt;count&lt;/code&gt; characters beginning at &lt;code&gt;start&lt;/code&gt;
-            have just replaced old text that had length &lt;code&gt;before&lt;/code&gt;.</summary>
+        <summary>This method is called to notify you that, within <c>s</c>,
+            the <c>count</c> characters beginning at <c>start</c>
+            have just replaced old text that had length <c>before</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Text/LoginFilter.xml b/docs/Mono.Android/en/Android.Text/LoginFilter.xml
index 00fe860d7e..978a95b890 100644
--- a/docs/Mono.Android/en/Android.Text/LoginFilter.xml
+++ b/docs/Mono.Android/en/Android.Text/LoginFilter.xml
@@ -109,9 +109,9 @@
         <param name="dstart">To be added.</param>
         <param name="dend">To be added.</param>
         <summary>This method is called when the buffer is going to replace the
-            range &lt;code&gt;dstart &amp;hellip; dend&lt;/code&gt; of &lt;code&gt;dest&lt;/code&gt;
-            with the new text from the range &lt;code&gt;start &amp;hellip; end&lt;/code&gt;
-            of &lt;code&gt;source&lt;/code&gt;.</summary>
+            range <c>dstart &amp;hellip; dend</c> of <c>dest</c>
+            with the new text from the range <c>start &amp;hellip; end</c>
+            of <c>source</c>.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
@@ -169,9 +169,9 @@
         <param name="dstart">To be added.</param>
         <param name="dend">To be added.</param>
         <summary>This method is called when the buffer is going to replace the
-            range &lt;code&gt;dstart &amp;hellip; dend&lt;/code&gt; of &lt;code&gt;dest&lt;/code&gt;
-            with the new text from the range &lt;code&gt;start &amp;hellip; end&lt;/code&gt;
-            of &lt;code&gt;source&lt;/code&gt;.</summary>
+            range <c>dstart &amp;hellip; dend</c> of <c>dest</c>
+            with the new text from the range <c>start &amp;hellip; end</c>
+            of <c>source</c>.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Text/Selection.xml b/docs/Mono.Android/en/Android.Text/Selection.xml
index 28d9215cd2..359f73e09c 100644
--- a/docs/Mono.Android/en/Android.Text/Selection.xml
+++ b/docs/Mono.Android/en/Android.Text/Selection.xml
@@ -215,7 +215,7 @@
       <Docs>
         <param name="text">To be added.</param>
         <param name="index">To be added.</param>
-        <summary>Move the selection edge to offset &lt;code&gt;index&lt;/code&gt;.</summary>
+        <summary>Move the selection edge to offset <c>index</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -946,7 +946,7 @@
       <Docs>
         <param name="text">To be added.</param>
         <param name="index">To be added.</param>
-        <summary>Move the cursor to offset &lt;code&gt;index&lt;/code&gt;.</summary>
+        <summary>Move the cursor to offset <c>index</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -990,8 +990,8 @@
         <param name="text">To be added.</param>
         <param name="start">To be added.</param>
         <param name="stop">To be added.</param>
-        <summary>Set the selection anchor to &lt;code&gt;start&lt;/code&gt; and the selection edge
-            to &lt;code&gt;stop&lt;/code&gt;.</summary>
+        <summary>Set the selection anchor to <c>start</c> and the selection edge
+            to <c>stop</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Text/SpannableStringBuilder.xml b/docs/Mono.Android/en/Android.Text/SpannableStringBuilder.xml
index 7e2b23ad51..35c7f9fb21 100644
--- a/docs/Mono.Android/en/Android.Text/SpannableStringBuilder.xml
+++ b/docs/Mono.Android/en/Android.Text/SpannableStringBuilder.xml
@@ -1316,8 +1316,8 @@
         <param name="start">To be added.</param>
         <param name="limit">To be added.</param>
         <param name="kind">To be added.</param>
-        <summary>Return the next offset after &lt;code&gt;start&lt;/code&gt; but less than or
-            equal to &lt;code&gt;limit&lt;/code&gt; where a span of the specified type
+        <summary>Return the next offset after <c>start</c> but less than or
+            equal to <c>limit</c> where a span of the specified type
             begins or ends.</summary>
         <returns>To be added.</returns>
         <remarks>
diff --git a/docs/Mono.Android/en/Android.Text/TextUtils.xml b/docs/Mono.Android/en/Android.Text/TextUtils.xml
index f3835062c7..66444df93c 100644
--- a/docs/Mono.Android/en/Android.Text/TextUtils.xml
+++ b/docs/Mono.Android/en/Android.Text/TextUtils.xml
@@ -310,7 +310,9 @@
         <param name="kind">To be added.</param>
         <param name="dest">To be added.</param>
         <param name="destoff">To be added.</param>
-        <summary>Copies the spans from the region &lt;code&gt;start.</summary>
+        <summary>Copies the spans from the region <c>start...end</c> in
+            <c>source</c> to the region
+            <c>destoff...destoff+end-start</c> in <c>dest</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Transitions/ChangeBounds.xml b/docs/Mono.Android/en/Android.Transitions/ChangeBounds.xml
index 086a1e9825..698a332e18 100644
--- a/docs/Mono.Android/en/Android.Transitions/ChangeBounds.xml
+++ b/docs/Mono.Android/en/Android.Transitions/ChangeBounds.xml
@@ -326,7 +326,7 @@
       <Docs>
         <param name="resizeClip">Used to indicate whether the view bounds should be modified or the
                               clip bounds should be modified by ChangeBounds.</param>
-        <summary>When &lt;code&gt;resizeClip&lt;/code&gt; is true, ChangeBounds resizes the view using the clipBounds
+        <summary>When <c>resizeClip</c> is true, ChangeBounds resizes the view using the clipBounds
             instead of changing the dimensions of the view during the animation.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Transitions/ChangeTransform.xml b/docs/Mono.Android/en/Android.Transitions/ChangeTransform.xml
index 95fef24c13..633cdf8642 100644
--- a/docs/Mono.Android/en/Android.Transitions/ChangeTransform.xml
+++ b/docs/Mono.Android/en/Android.Transitions/ChangeTransform.xml
@@ -291,13 +291,15 @@
         <ReturnType>System.Boolean</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="reparentWithOverlay">&lt;code&gt;true&lt;/code&gt; when a changed parent should execute the
-                                       transition inside the scene root's overlay or &lt;code&gt;false&lt;/code&gt;
+        <param name="reparentWithOverlay">
+          <c>true</c> when a changed parent should execute the
+                                       transition inside the scene root's overlay or <c>false</c>
                                        if a parent change only affects the transform of the transitioning
                                        view.</param>
         <summary>Returns whether changes to parent should use an overlay or not. -or- Sets whether changes to parent should use an overlay or not.</summary>
-        <value>&lt;code&gt;true&lt;/code&gt; when a changed parent should execute the transition
-            inside the scene root's overlay or &lt;code&gt;false&lt;/code&gt; if a parent change only
+        <value>
+          <c>true</c> when a changed parent should execute the transition
+            inside the scene root's overlay or <c>false</c> if a parent change only
             affects the transform of the transitioning view.</value>
         <remarks>
           <para>Property getter documentation:</para>
diff --git a/docs/Mono.Android/en/Android.Transitions/PathMotion.xml b/docs/Mono.Android/en/Android.Transitions/PathMotion.xml
index f1861bdd0f..88e1151749 100644
--- a/docs/Mono.Android/en/Android.Transitions/PathMotion.xml
+++ b/docs/Mono.Android/en/Android.Transitions/PathMotion.xml
@@ -140,11 +140,11 @@
         <param name="startY">The y coordinate of the starting point.</param>
         <param name="endX">The x coordinate of the ending point.</param>
         <param name="endY">The y coordinate of the ending point.</param>
-        <summary>Provide a Path to interpolate between two points &lt;code&gt;(startX, startY)&lt;/code&gt; and
-            &lt;code&gt;(endX, endY)&lt;/code&gt;.</summary>
+        <summary>Provide a Path to interpolate between two points <c>(startX, startY)</c> and
+            <c>(endX, endY)</c>.</summary>
         <returns>A Path along which the points should be interpolated. The returned Path
-            must start at point &lt;code&gt;(startX, startY)&lt;/code&gt;, typically using
-            <c>android.graphics.Path#moveTo(float, float)</c> and end at &lt;code&gt;(endX, endY)&lt;/code&gt;.</returns>
+            must start at point <c>(startX, startY)</c>, typically using
+            <c>android.graphics.Path#moveTo(float, float)</c> and end at <c>(endX, endY)</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Transitions/Scene.xml b/docs/Mono.Android/en/Android.Transitions/Scene.xml
index 23530bc5e5..e3237b6085 100644
--- a/docs/Mono.Android/en/Android.Transitions/Scene.xml
+++ b/docs/Mono.Android/en/Android.Transitions/Scene.xml
@@ -304,7 +304,7 @@
         <param name="context">The context used in the process of inflating
             the layout resource.</param>
         <summary>Returns a Scene described by the resource file associated with the given
-            &lt;code&gt;layoutId&lt;/code&gt; parameter.</summary>
+            <c>layoutId</c> parameter.</summary>
         <returns>The scene for the given root and layout id</returns>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Transitions/SidePropagation.xml b/docs/Mono.Android/en/Android.Transitions/SidePropagation.xml
index 07c481fab7..62f41d923c 100644
--- a/docs/Mono.Android/en/Android.Transitions/SidePropagation.xml
+++ b/docs/Mono.Android/en/Android.Transitions/SidePropagation.xml
@@ -18,7 +18,7 @@
     </Attribute>
   </Attributes>
   <Docs since="21">
-    <summary>A &lt;code&gt;TransitionPropagation&lt;/code&gt; that propagates based on the distance to the side
+    <summary>A <c>TransitionPropagation</c> that propagates based on the distance to the side
             and, orthogonally, the distance to epicenter.</summary>
     <remarks>
       <para>
diff --git a/docs/Mono.Android/en/Android.Transitions/Transition+EpicenterCallback.xml b/docs/Mono.Android/en/Android.Transitions/Transition+EpicenterCallback.xml
index 43854fe7c8..67370be509 100644
--- a/docs/Mono.Android/en/Android.Transitions/Transition+EpicenterCallback.xml
+++ b/docs/Mono.Android/en/Android.Transitions/Transition+EpicenterCallback.xml
@@ -136,7 +136,7 @@
         <param name="transition">The transition for which the epicenter applies.</param>
         <summary>Implementers must override to return the epicenter of the Transition in screen
             coordinates.</summary>
-        <returns>The Rect region of the epicenter of &lt;code&gt;transition&lt;/code&gt; or null if
+        <returns>The Rect region of the epicenter of <c>transition</c> or null if
             there is no epicenter.</returns>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Transitions/Transition.xml b/docs/Mono.Android/en/Android.Transitions/Transition.xml
index bf9178ee0c..6c8318db60 100644
--- a/docs/Mono.Android/en/Android.Transitions/Transition.xml
+++ b/docs/Mono.Android/en/Android.Transitions/Transition.xml
@@ -213,7 +213,7 @@
         <returns>The Transition to which the target is added.
             Returning the same object makes it easier to chain calls during
             construction, such as
-            &lt;code&gt;transitionSet.addTransitions(new Fade()).addTarget(someView);&lt;/code&gt;</returns>
+            <c>transitionSet.addTransitions(new Fade()).addTarget(someView);</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -258,7 +258,7 @@
         <returns>The Transition to which the target class was added.
             Returning the same object makes it easier to chain calls during
             construction, such as
-            &lt;code&gt;transitionSet.addTransitions(new Fade()).addTarget(ImageView.class);&lt;/code&gt;</returns>
+            <c>transitionSet.addTransitions(new Fade()).addTarget(ImageView.class);</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -306,7 +306,7 @@
         <returns>The Transition to which the targetId is added.
             Returning the same object makes it easier to chain calls during
             construction, such as
-            &lt;code&gt;transitionSet.addTransitions(new Fade()).addTarget(someId);&lt;/code&gt;</returns>
+            <c>transitionSet.addTransitions(new Fade()).addTarget(someId);</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -351,7 +351,7 @@
         <returns>The Transition to which the target transitionName is added.
             Returning the same object makes it easier to chain calls during
             construction, such as
-            &lt;code&gt;transitionSet.addTransitions(new Fade()).addTarget(someName);&lt;/code&gt;</returns>
+            <c>transitionSet.addTransitions(new Fade()).addTarget(someName);</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -420,12 +420,12 @@
       </Parameters>
       <Docs>
         <param name="transitionValues">The holder for any values that the Transition
-            wishes to store. Values are stored in the &lt;code&gt;values&lt;/code&gt; field
+            wishes to store. Values are stored in the <c>values</c> field
             of this TransitionValues object and are keyed from
             a String value. For example, to store a view's rotation value,
             a transition might call
-            &lt;code&gt;transitionValues.values.put("appname:transitionname:rotation",
-            view.getRotation())&lt;/code&gt;. The target view will already be stored in
+            <c>transitionValues.values.put("appname:transitionname:rotation",
+            view.getRotation())</c>. The target view will already be stored in
             the transitionValues structure when this method is called.</param>
         <summary>Captures the values in the end scene for the properties that this
             transition monitors.</summary>
@@ -469,12 +469,12 @@
       </Parameters>
       <Docs>
         <param name="transitionValues">The holder for any values that the Transition
-            wishes to store. Values are stored in the &lt;code&gt;values&lt;/code&gt; field
+            wishes to store. Values are stored in the <c>values</c> field
             of this TransitionValues object and are keyed from
             a String value. For example, to store a view's rotation value,
             a transition might call
-            &lt;code&gt;transitionValues.values.put("appname:transitionname:rotation",
-            view.getRotation())&lt;/code&gt;. The target view will already be stored in
+            <c>transitionValues.values.put("appname:transitionname:rotation",
+            view.getRotation())</c>. The target view will already be stored in
             the transitionValues structure when this method is called.</param>
         <summary>Captures the values in the start scene for the properties that this
             transition monitors.</summary>
@@ -1038,7 +1038,7 @@
             object passed into <c>#captureStartValues(TransitionValues)</c> that
             this transition cares about for the purposes of canceling overlapping animations.</summary>
         <returns>An array of property names as described in the class documentation for
-            <c>TransitionValues</c>. The default implementation returns &lt;code&gt;null&lt;/code&gt;.</returns>
+            <c>TransitionValues</c>. The default implementation returns <c>null</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1589,7 +1589,7 @@
         <returns>Transition The Transition from which the target is removed.
             Returning the same object makes it easier to chain calls during
             construction, such as
-            &lt;code&gt;transitionSet.addTransitions(new Fade()).removeTarget(someView);&lt;/code&gt;</returns>
+            <c>transitionSet.addTransitions(new Fade()).removeTarget(someView);</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1633,7 +1633,7 @@
         <returns>Transition The Transition from which the target is removed.
             Returning the same object makes it easier to chain calls during
             construction, such as
-            &lt;code&gt;transitionSet.addTransitions(new Fade()).removeTarget(someType);&lt;/code&gt;</returns>
+            <c>transitionSet.addTransitions(new Fade()).removeTarget(someType);</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1677,7 +1677,7 @@
         <returns>The Transition from which the targetId is removed.
             Returning the same object makes it easier to chain calls during
             construction, such as
-            &lt;code&gt;transitionSet.addTransitions(new Fade()).removeTargetId(someId);&lt;/code&gt;</returns>
+            <c>transitionSet.addTransitions(new Fade()).removeTargetId(someId);</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1721,7 +1721,7 @@
         <returns>The Transition from which the targetName is removed.
             Returning the same object makes it easier to chain calls during
             construction, such as
-            &lt;code&gt;transitionSet.addTransitions(new Fade()).removeTargetName(someName);&lt;/code&gt;</returns>
+            <c>transitionSet.addTransitions(new Fade()).removeTargetName(someName);</c></returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Transitions/TransitionPropagation.xml b/docs/Mono.Android/en/Android.Transitions/TransitionPropagation.xml
index dfd03f37df..d3c2e9a853 100644
--- a/docs/Mono.Android/en/Android.Transitions/TransitionPropagation.xml
+++ b/docs/Mono.Android/en/Android.Transitions/TransitionPropagation.xml
@@ -18,7 +18,7 @@
     </Attribute>
   </Attributes>
   <Docs since="21">
-    <summary>Extend &lt;code&gt;TransitionPropagation&lt;/code&gt; to customize start delays for Animators created
+    <summary>Extend <c>TransitionPropagation</c> to customize start delays for Animators created
             in <c>android.transition.Transition#createAnimator(ViewGroup,
             TransitionValues, TransitionValues)</c>.</summary>
     <remarks>
@@ -106,12 +106,12 @@
       </Parameters>
       <Docs>
         <param name="transitionValues">The holder for any values that the Transition
-            wishes to store. Values are stored in the &lt;code&gt;values&lt;/code&gt; field
+            wishes to store. Values are stored in the <c>values</c> field
             of this TransitionValues object and are keyed from
             a String value. For example, to store a view's rotation value,
             a transition might call
-            &lt;code&gt;transitionValues.values.put("appname:transitionname:rotation",
-            view.getRotation())&lt;/code&gt;. The target view will already be stored in
+            <c>transitionValues.values.put("appname:transitionname:rotation",
+            view.getRotation())</c>. The target view will already be stored in
             the transitionValues structure when this method is called.</param>
         <summary>Captures the values in the start or end scene for the properties that this
             transition propagation monitors.</summary>
@@ -201,8 +201,8 @@
         <param name="startValues">The values for a specific target in the start scene.</param>
         <param name="endValues">The values for the target in the end scene.</param>
         <summary>Called by Transition to alter the Animator start delay.</summary>
-        <returns>A start delay to use with the Animator created by &lt;code&gt;transition&lt;/code&gt;. The
-            delay will be offset by the minimum delay of all &lt;code&gt;TransitionPropagation&lt;/code&gt;s
+        <returns>A start delay to use with the Animator created by <c>transition</c>. The
+            delay will be offset by the minimum delay of all <c>TransitionPropagation</c>s
             used in the Transition so that the smallest delay will be 0. Returned values may be
             negative.</returns>
         <remarks>
diff --git a/docs/Mono.Android/en/Android.Transitions/Visibility.xml b/docs/Mono.Android/en/Android.Transitions/Visibility.xml
index 73cab6e49e..c57f9361d0 100644
--- a/docs/Mono.Android/en/Android.Transitions/Visibility.xml
+++ b/docs/Mono.Android/en/Android.Transitions/Visibility.xml
@@ -214,7 +214,7 @@
             which visibility is determined.</param>
         <summary>Returns whether the view is 'visible' according to the given values
             object.</summary>
-        <returns>True if the view reference by &lt;code&gt;values&lt;/code&gt; is visible,
+        <returns>True if the view reference by <c>values</c> is visible,
             false otherwise.</returns>
         <remarks>
           <para>
@@ -288,7 +288,7 @@
         <param name="mode">The behavior supported by this transition, a combination of
                         <c>#MODE_IN</c> and <c>#MODE_OUT</c>.</param>
         <summary>Returns whether appearing and/or disappearing Views are supported. -or- Changes the transition to support appearing and/or disappearing Views, depending
-            on &lt;code&gt;mode&lt;/code&gt;.</summary>
+            on <c>mode</c>.</summary>
         <value>To be added.</value>
         <remarks>
           <para>Property getter documentation:</para>
diff --git a/docs/Mono.Android/en/Android.Transitions/VisibilityPropagation.xml b/docs/Mono.Android/en/Android.Transitions/VisibilityPropagation.xml
index dfacefc6f6..952e18d262 100644
--- a/docs/Mono.Android/en/Android.Transitions/VisibilityPropagation.xml
+++ b/docs/Mono.Android/en/Android.Transitions/VisibilityPropagation.xml
@@ -18,7 +18,7 @@
     </Attribute>
   </Attributes>
   <Docs since="21">
-    <summary>Base class for &lt;code&gt;TransitionPropagation&lt;/code&gt;s that care about
+    <summary>Base class for <c>TransitionPropagation</c>s that care about
             View Visibility and the center position of the View.</summary>
     <remarks>
       <para>
diff --git a/docs/Mono.Android/en/Android.Util/FloatProperty.xml b/docs/Mono.Android/en/Android.Util/FloatProperty.xml
index c2f4b83461..93aaa94e5f 100644
--- a/docs/Mono.Android/en/Android.Util/FloatProperty.xml
+++ b/docs/Mono.Android/en/Android.Util/FloatProperty.xml
@@ -24,7 +24,7 @@
   <Docs>
     <param name="&lt;T&gt;&lt;T&gt;">The class on which the Property is declared.</param>
     <summary>An implementation of <c>android.util.Property</c> to be used specifically with fields of type
-            &lt;code&gt;float&lt;/code&gt;.</summary>
+            <c>float</c>.</summary>
     <remarks>
       <para>
         <format type="text/html">
@@ -179,7 +179,7 @@
         <param name="object">To be added.</param>
         <param name="value">To be added.</param>
         <summary>A type-specific variant of <c>#set(Object, Float)</c> that is faster when dealing
-            with fields of type &lt;code&gt;float&lt;/code&gt;.</summary>
+            with fields of type <c>float</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Util/IntProperty.xml b/docs/Mono.Android/en/Android.Util/IntProperty.xml
index 6d90314898..f5ce433f00 100644
--- a/docs/Mono.Android/en/Android.Util/IntProperty.xml
+++ b/docs/Mono.Android/en/Android.Util/IntProperty.xml
@@ -24,7 +24,7 @@
   <Docs>
     <param name="&lt;T&gt;&lt;T&gt;">The class on which the Property is declared.</param>
     <summary>An implementation of <c>android.util.Property</c> to be used specifically with fields of type
-            &lt;code&gt;int&lt;/code&gt;.</summary>
+            <c>int</c>.</summary>
     <remarks>
       <para>
         <format type="text/html">
@@ -179,7 +179,7 @@
         <param name="object">To be added.</param>
         <param name="value">To be added.</param>
         <summary>A type-specific variant of <c>#set(Object, Integer)</c> that is faster when dealing
-            with fields of type &lt;code&gt;int&lt;/code&gt;.</summary>
+            with fields of type <c>int</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Util/LongSparseArray.xml b/docs/Mono.Android/en/Android.Util/LongSparseArray.xml
index 55572b203c..18ed225ba5 100644
--- a/docs/Mono.Android/en/Android.Util/LongSparseArray.xml
+++ b/docs/Mono.Android/en/Android.Util/LongSparseArray.xml
@@ -318,7 +318,7 @@
       </Parameters>
       <Docs>
         <param name="key">To be added.</param>
-        <summary>Gets the Object mapped from the specified key, or &lt;code&gt;null&lt;/code&gt;
+        <summary>Gets the Object mapped from the specified key, or <c>null</c>
             if no such mapping has been made.</summary>
         <returns>To be added.</returns>
         <remarks>
@@ -522,7 +522,9 @@
       </Parameters>
       <Docs>
         <param name="index">To be added.</param>
-        <summary>Given an index in the range &lt;code&gt;0.</summary>
+        <summary>Given an index in the range <c>0...size()-1</c>, returns
+            the key from the <c>index</c>th key-value mapping that this
+            LongSparseArray stores.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
@@ -688,7 +690,9 @@
       <Docs>
         <param name="index">To be added.</param>
         <param name="value">To be added.</param>
-        <summary>Given an index in the range &lt;code&gt;0.</summary>
+        <summary>Given an index in the range <c>0...size()-1</c>, sets a new
+            value for the <c>index</c>th key-value mapping that this
+            LongSparseArray stores.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -828,7 +832,9 @@
       </Parameters>
       <Docs>
         <param name="index">To be added.</param>
-        <summary>Given an index in the range &lt;code&gt;0.</summary>
+        <summary>Given an index in the range <c>0...size()-1</c>, returns
+            the value from the <c>index</c>th key-value mapping that this
+            LongSparseArray stores.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Util/Property.xml b/docs/Mono.Android/en/Android.Util/Property.xml
index fb6a029ad1..6c65ac8b12 100644
--- a/docs/Mono.Android/en/Android.Util/Property.xml
+++ b/docs/Mono.Android/en/Android.Util/Property.xml
@@ -126,7 +126,7 @@
       </Parameters>
       <Docs>
         <param name="object">To be added.</param>
-        <summary>Returns the current value that this property represents on the given &lt;code&gt;object&lt;/code&gt;.</summary>
+        <summary>Returns the current value that this property represents on the given <c>object</c>.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
@@ -280,16 +280,14 @@
         <param name="hostType">To be added.</param>
         <param name="valueType">To be added.</param>
         <param name="name">To be added.</param>
-        <summary>This factory method creates and returns a Property given the &lt;code&gt;class&lt;/code&gt; and
-            &lt;code&gt;name&lt;/code&gt; parameters, where the &lt;code&gt;"name"&lt;/code&gt; parameter represents either:
+        <summary>This factory method creates and returns a Property given the <c>class</c> and
+            <c>name</c> parameters, where the <c>"name"</c> parameter represents either:
             &lt;ul&gt;
-                &lt;li&gt;a public &lt;code&gt;getName()&lt;/code&gt; method on the class which takes no arguments, plus an
-                optional public &lt;code&gt;setName()&lt;/code&gt; method which takes a value of the same type
-                returned by &lt;code&gt;getName()&lt;/code&gt;
-                &lt;li&gt;a public &lt;code&gt;isName()&lt;/code&gt; method on the class which takes no arguments, plus an
-                optional public &lt;code&gt;setName()&lt;/code&gt; method which takes a value of the same type
-                returned by &lt;code&gt;isName()&lt;/code&gt;
-                &lt;li&gt;a public &lt;code&gt;name&lt;/code&gt; field on the class
+                &lt;li&gt;a public <c>getName()</c> method on the class which takes no arguments, plus an
+                optional public <c>setName()</c> method which takes a value of the same type
+                returned by <c>getName()</c>&lt;li&gt;a public <c>isName()</c> method on the class which takes no arguments, plus an
+                optional public <c>setName()</c> method which takes a value of the same type
+                returned by <c>isName()</c>&lt;li&gt;a public <c>name</c> field on the class
             &lt;/ul&gt;</summary>
         <returns>To be added.</returns>
         <remarks>
@@ -332,7 +330,7 @@
       <Docs>
         <param name="object">To be added.</param>
         <param name="value">To be added.</param>
-        <summary>Sets the value on &lt;code&gt;object&lt;/code&gt; which this property represents.</summary>
+        <summary>Sets the value on <c>object</c> which this property represents.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Util/SizeF+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Util/SizeF+InterfaceConsts.xml
index db01f867e0..899dc72ae5 100644
--- a/docs/Mono.Android/en/Android.Util/SizeF+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Util/SizeF+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Util/SparseArray.xml b/docs/Mono.Android/en/Android.Util/SparseArray.xml
index c0fb754bed..f87e7cf0a1 100644
--- a/docs/Mono.Android/en/Android.Util/SparseArray.xml
+++ b/docs/Mono.Android/en/Android.Util/SparseArray.xml
@@ -35,7 +35,8 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>&lt;code&gt;SparseArray&lt;/code&gt; maps integers to Objects and, unlike a normal array of Objects,
+    <summary>
+      <c>SparseArray</c> maps integers to Objects and, unlike a normal array of Objects,
             its indices can contain gaps.</summary>
     <remarks>
       <para>
@@ -437,7 +438,7 @@
       </Parameters>
       <Docs>
         <param name="key">To be added.</param>
-        <summary>Gets the Object mapped from the specified key, or &lt;code&gt;null&lt;/code&gt;
+        <summary>Gets the Object mapped from the specified key, or <c>null</c>
             if no such mapping has been made.</summary>
         <returns>To be added.</returns>
         <remarks>
@@ -641,7 +642,9 @@
       </Parameters>
       <Docs>
         <param name="index">To be added.</param>
-        <summary>Given an index in the range &lt;code&gt;0.</summary>
+        <summary>Given an index in the range <c>0...size()-1</c>, returns
+            the key from the <c>index</c>th key-value mapping that this
+            SparseArray stores.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
@@ -808,7 +811,7 @@
         <param name="index">Index to begin at</param>
         <param name="size">Number of mappings to remove
             
-            &lt;p&gt;For indices outside of the range &lt;code&gt;0...size()-1&lt;/code&gt;,
+            &lt;p&gt;For indices outside of the range <c>0...size()-1</c>,
             the behavior is undefined.&lt;/p&gt;</param>
         <summary>Remove a range of mappings as a batch.</summary>
         <remarks>
@@ -892,7 +895,9 @@
       <Docs>
         <param name="index">To be added.</param>
         <param name="value">To be added.</param>
-        <summary>Given an index in the range &lt;code&gt;0.</summary>
+        <summary>Given an index in the range <c>0...size()-1</c>, sets a new
+            value for the <c>index</c>th key-value mapping that this
+            SparseArray stores.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -1032,7 +1037,9 @@
       </Parameters>
       <Docs>
         <param name="index">To be added.</param>
-        <summary>Given an index in the range &lt;code&gt;0.</summary>
+        <summary>Given an index in the range <c>0...size()-1</c>, returns
+            the value from the <c>index</c>th key-value mapping that this
+            SparseArray stores.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Util/SparseBooleanArray.xml b/docs/Mono.Android/en/Android.Util/SparseBooleanArray.xml
index 39fb61e483..a3e1499f85 100644
--- a/docs/Mono.Android/en/Android.Util/SparseBooleanArray.xml
+++ b/docs/Mono.Android/en/Android.Util/SparseBooleanArray.xml
@@ -315,7 +315,7 @@
       </Parameters>
       <Docs>
         <param name="key">To be added.</param>
-        <summary>Gets the boolean mapped from the specified key, or &lt;code&gt;false&lt;/code&gt;
+        <summary>Gets the boolean mapped from the specified key, or <c>false</c>
             if no such mapping has been made.</summary>
         <returns>To be added.</returns>
         <remarks>
@@ -521,7 +521,9 @@
       </Parameters>
       <Docs>
         <param name="index">To be added.</param>
-        <summary>Given an index in the range &lt;code&gt;0.</summary>
+        <summary>Given an index in the range <c>0...size()-1</c>, returns
+            the key from the <c>index</c>th key-value mapping that this
+            SparseBooleanArray stores.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
@@ -787,7 +789,9 @@
       </Parameters>
       <Docs>
         <param name="index">To be added.</param>
-        <summary>Given an index in the range &lt;code&gt;0.</summary>
+        <summary>Given an index in the range <c>0...size()-1</c>, returns
+            the value from the <c>index</c>th key-value mapping that this
+            SparseBooleanArray stores.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Util/SparseIntArray.xml b/docs/Mono.Android/en/Android.Util/SparseIntArray.xml
index 76b5ad771c..3dced04cf6 100644
--- a/docs/Mono.Android/en/Android.Util/SparseIntArray.xml
+++ b/docs/Mono.Android/en/Android.Util/SparseIntArray.xml
@@ -315,7 +315,7 @@
       </Parameters>
       <Docs>
         <param name="key">To be added.</param>
-        <summary>Gets the int mapped from the specified key, or &lt;code&gt;0&lt;/code&gt;
+        <summary>Gets the int mapped from the specified key, or <c>0</c>
             if no such mapping has been made.</summary>
         <returns>To be added.</returns>
         <remarks>
@@ -521,7 +521,9 @@
       </Parameters>
       <Docs>
         <param name="index">To be added.</param>
-        <summary>Given an index in the range &lt;code&gt;0.</summary>
+        <summary>Given an index in the range <c>0...size()-1</c>, returns
+            the key from the <c>index</c>th key-value mapping that this
+            SparseIntArray stores.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
@@ -788,7 +790,9 @@
       </Parameters>
       <Docs>
         <param name="index">To be added.</param>
-        <summary>Given an index in the range &lt;code&gt;0.</summary>
+        <summary>Given an index in the range <c>0...size()-1</c>, returns
+            the value from the <c>index</c>th key-value mapping that this
+            SparseIntArray stores.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Util/SparseLongArray.xml b/docs/Mono.Android/en/Android.Util/SparseLongArray.xml
index f32812f16a..1f78662cd2 100644
--- a/docs/Mono.Android/en/Android.Util/SparseLongArray.xml
+++ b/docs/Mono.Android/en/Android.Util/SparseLongArray.xml
@@ -315,7 +315,7 @@
       </Parameters>
       <Docs>
         <param name="key">To be added.</param>
-        <summary>Gets the long mapped from the specified key, or &lt;code&gt;0&lt;/code&gt;
+        <summary>Gets the long mapped from the specified key, or <c>0</c>
             if no such mapping has been made.</summary>
         <returns>To be added.</returns>
         <remarks>
@@ -521,7 +521,9 @@
       </Parameters>
       <Docs>
         <param name="index">To be added.</param>
-        <summary>Given an index in the range &lt;code&gt;0.</summary>
+        <summary>Given an index in the range <c>0...size()-1</c>, returns
+            the key from the <c>index</c>th key-value mapping that this
+            SparseLongArray stores.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
@@ -747,7 +749,9 @@
       </Parameters>
       <Docs>
         <param name="index">To be added.</param>
-        <summary>Given an index in the range &lt;code&gt;0.</summary>
+        <summary>Given an index in the range <c>0...size()-1</c>, returns
+            the value from the <c>index</c>th key-value mapping that this
+            SparseLongArray stores.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Views.Accessibility/AccessibilityEvent+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views.Accessibility/AccessibilityEvent+InterfaceConsts.xml
index 0a5599e315..9d6bd03eb1 100644
--- a/docs/Mono.Android/en/Android.Views.Accessibility/AccessibilityEvent+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views.Accessibility/AccessibilityEvent+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views.Accessibility/AccessibilityEvent.xml b/docs/Mono.Android/en/Android.Views.Accessibility/AccessibilityEvent.xml
index c6d19518be..ec1a03015d 100644
--- a/docs/Mono.Android/en/Android.Views.Accessibility/AccessibilityEvent.xml
+++ b/docs/Mono.Android/en/Android.Views.Accessibility/AccessibilityEvent.xml
@@ -138,7 +138,7 @@
       </Parameters>
       <Docs>
         <param name="eventType">The event type.</param>
-        <summary>Creates a new <c>AccessibilityEvent</c> with the given &lt;code&gt;eventType&lt;/code&gt;.</summary>
+        <summary>Creates a new <c>AccessibilityEvent</c> with the given <c>eventType</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views.Accessibility/AccessibilityNodeInfo+AccessibilityAction+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views.Accessibility/AccessibilityNodeInfo+AccessibilityAction+InterfaceConsts.xml
index 43d1b840b2..27c4e95b83 100644
--- a/docs/Mono.Android/en/Android.Views.Accessibility/AccessibilityNodeInfo+AccessibilityAction+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views.Accessibility/AccessibilityNodeInfo+AccessibilityAction+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views.Accessibility/AccessibilityNodeInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views.Accessibility/AccessibilityNodeInfo+InterfaceConsts.xml
index 84788f7fd5..6784e02780 100644
--- a/docs/Mono.Android/en/Android.Views.Accessibility/AccessibilityNodeInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views.Accessibility/AccessibilityNodeInfo+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views.Accessibility/AccessibilityNodeInfo+TouchDelegateInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views.Accessibility/AccessibilityNodeInfo+TouchDelegateInfo+InterfaceConsts.xml
index bbb1dfbead..391de3fc87 100644
--- a/docs/Mono.Android/en/Android.Views.Accessibility/AccessibilityNodeInfo+TouchDelegateInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views.Accessibility/AccessibilityNodeInfo+TouchDelegateInfo+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views.Accessibility/AccessibilityNodeInfo.xml b/docs/Mono.Android/en/Android.Views.Accessibility/AccessibilityNodeInfo.xml
index 19a7bf7336..68d562fc4f 100644
--- a/docs/Mono.Android/en/Android.Views.Accessibility/AccessibilityNodeInfo.xml
+++ b/docs/Mono.Android/en/Android.Views.Accessibility/AccessibilityNodeInfo.xml
@@ -137,7 +137,7 @@
       </Parameters>
       <Docs>
         <param name="source">The source view.</param>
-        <summary>Creates a new <c>AccessibilityNodeInfo</c> with the given &lt;code&gt;source&lt;/code&gt;.</summary>
+        <summary>Creates a new <c>AccessibilityNodeInfo</c> with the given <c>source</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -175,7 +175,7 @@
       <Docs>
         <param name="root">The root of the virtual subtree.</param>
         <param name="virtualDescendantId">The id of the virtual descendant.</param>
-        <summary>Creates a new <c>AccessibilityNodeInfo</c> with the given &lt;code&gt;source&lt;/code&gt;.</summary>
+        <summary>Creates a new <c>AccessibilityNodeInfo</c> with the given <c>source</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -1973,7 +1973,7 @@
       <Docs>
         <param name="root">The root of the virtual subtree.</param>
         <param name="virtualDescendantId">The id of the virtual child.</param>
-        <summary>Adds a virtual child which is a descendant of the given &lt;code&gt;root&lt;/code&gt;.</summary>
+        <summary>Adds a virtual child which is a descendant of the given <c>root</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -5508,7 +5508,7 @@
         <param name="root">The root of the virtual subtree.</param>
         <param name="virtualDescendantId">The id of the virtual child.</param>
         <summary>Removes a virtual child which is a descendant of the given
-            &lt;code&gt;root&lt;/code&gt;.</summary>
+            <c>root</c>.</summary>
         <returns>true if the child was present</returns>
         <remarks>
           <para>
@@ -6140,7 +6140,7 @@
       <Docs>
         <param name="root">The root of the virtual subtree.</param>
         <param name="virtualDescendantId">The id of the virtual descendant.</param>
-        <summary>Sets the parent to be a virtual descendant of the given &lt;code&gt;root&lt;/code&gt;.</summary>
+        <summary>Sets the parent to be a virtual descendant of the given <c>root</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -6261,7 +6261,7 @@
       <Docs>
         <param name="root">The root of the virtual subtree.</param>
         <param name="virtualDescendantId">The id of the virtual descendant.</param>
-        <summary>Sets the source to be a virtual descendant of the given &lt;code&gt;root&lt;/code&gt;.</summary>
+        <summary>Sets the source to be a virtual descendant of the given <c>root</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -6999,7 +6999,7 @@
       </ReturnValue>
       <Docs>
         <summary>Gets the node after which this one is visited in accessibility traversal.</summary>
-        <value>The succeeding node if such or &lt;code&gt;null&lt;/code&gt;.</value>
+        <value>The succeeding node if such or <c>null</c>.</value>
         <remarks>
           <para>
             <format type="text/html">
@@ -7035,7 +7035,7 @@
       </ReturnValue>
       <Docs>
         <summary>Gets the node before which this one is visited during traversal.</summary>
-        <value>The succeeding node if such or &lt;code&gt;null&lt;/code&gt;.</value>
+        <value>The succeeding node if such or <c>null</c>.</value>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views.Accessibility/AccessibilityNodeProvider.xml b/docs/Mono.Android/en/Android.Views.Accessibility/AccessibilityNodeProvider.xml
index 5905db8d4b..ce6599a131 100644
--- a/docs/Mono.Android/en/Android.Views.Accessibility/AccessibilityNodeProvider.xml
+++ b/docs/Mono.Android/en/Android.Views.Accessibility/AccessibilityNodeProvider.xml
@@ -156,8 +156,8 @@
       <Docs>
         <param name="virtualViewId">A client defined virtual view id.</param>
         <summary>Returns an <c>AccessibilityNodeInfo</c> representing a virtual view,
-            such as a descendant of the host View, with the given &lt;code&gt;virtualViewId&lt;/code&gt;
-            or the host View itself if &lt;code&gt;virtualViewId&lt;/code&gt; equals to <c>#HOST_VIEW_ID</c>.</summary>
+            such as a descendant of the host View, with the given <c>virtualViewId</c>
+            or the host View itself if <c>virtualViewId</c> equals to <c>#HOST_VIEW_ID</c>.</summary>
         <returns>A populated <c>AccessibilityNodeInfo</c> for a virtual descendant or the
                 host View.</returns>
         <remarks>
@@ -414,8 +414,8 @@
         <param name="action">The action to perform.</param>
         <param name="arguments">Optional action arguments.</param>
         <summary>Performs an accessibility action on a virtual view, such as a descendant of the
-            host View, with the given &lt;code&gt;virtualViewId&lt;/code&gt; or the host View itself
-            if &lt;code&gt;virtualViewId&lt;/code&gt; equals to <c>#HOST_VIEW_ID</c>.</summary>
+            host View, with the given <c>virtualViewId</c> or the host View itself
+            if <c>virtualViewId</c> equals to <c>#HOST_VIEW_ID</c>.</summary>
         <returns>True if the action was performed.</returns>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Views.Accessibility/AccessibilityRecord.xml b/docs/Mono.Android/en/Android.Views.Accessibility/AccessibilityRecord.xml
index 7232c7e9e8..7282cad0a2 100644
--- a/docs/Mono.Android/en/Android.Views.Accessibility/AccessibilityRecord.xml
+++ b/docs/Mono.Android/en/Android.Views.Accessibility/AccessibilityRecord.xml
@@ -1564,7 +1564,7 @@
       <Docs>
         <param name="root">The root of the virtual subtree.</param>
         <param name="virtualDescendantId">The id of the virtual descendant.</param>
-        <summary>Sets the source to be a virtual descendant of the given &lt;code&gt;root&lt;/code&gt;.</summary>
+        <summary>Sets the source to be a virtual descendant of the given <c>root</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views.Accessibility/AccessibilityWindowInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views.Accessibility/AccessibilityWindowInfo+InterfaceConsts.xml
index 50832af208..84583c0662 100644
--- a/docs/Mono.Android/en/Android.Views.Accessibility/AccessibilityWindowInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views.Accessibility/AccessibilityWindowInfo+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views.Animations/Animation.xml b/docs/Mono.Android/en/Android.Views.Animations/Animation.xml
index 8ae8f05caf..891d8b5ae1 100644
--- a/docs/Mono.Android/en/Android.Views.Animations/Animation.xml
+++ b/docs/Mono.Android/en/Android.Views.Animations/Animation.xml
@@ -1340,7 +1340,7 @@
         <ReturnType>System.Single</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>The scale factor is set by the call to &lt;code&gt;getTransformation&lt;/code&gt;.</summary>
+        <summary>The scale factor is set by the call to <c>getTransformation</c>.</summary>
         <value>float The scale factor that should be applied to pre-scaled values in
             an Animation such as the pivot points in <c>ScaleAnimation</c> and <c>RotateAnimation</c>.</value>
         <remarks>
diff --git a/docs/Mono.Android/en/Android.Views.Animations/PathInterpolator.xml b/docs/Mono.Android/en/Android.Views.Animations/PathInterpolator.xml
index f8607fa6f2..ab9e2e5f45 100644
--- a/docs/Mono.Android/en/Android.Views.Animations/PathInterpolator.xml
+++ b/docs/Mono.Android/en/Android.Views.Animations/PathInterpolator.xml
@@ -34,8 +34,7 @@
     </Attribute>
   </Attributes>
   <Docs since="21">
-    <summary>An interpolator that can traverse a Path that extends from &lt;code&gt;Point&lt;/code&gt;
-            &lt;code&gt;(0, 0)&lt;/code&gt; to &lt;code&gt;(1, 1)&lt;/code&gt;.</summary>
+    <summary>An interpolator that can traverse a Path that extends from <c>Point</c><c>(0, 0)</c> to <c>(1, 1)</c>.</summary>
     <remarks>
       <para>
         <format type="text/html">
@@ -70,8 +69,8 @@
         <Parameter Name="path" Type="Android.Graphics.Path" />
       </Parameters>
       <Docs>
-        <param name="path">The &lt;code&gt;Path&lt;/code&gt; to use to make the line representing the interpolator.</param>
-        <summary>Create an interpolator for an arbitrary &lt;code&gt;Path&lt;/code&gt;.</summary>
+        <param name="path">The <c>Path</c> to use to make the line representing the interpolator.</param>
+        <summary>Create an interpolator for an arbitrary <c>Path</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -255,9 +254,9 @@
       <Docs>
         <param name="t">Treated as the x coordinate along the line.</param>
         <summary>Using the line in the Path in this interpolator that can be described as
-            &lt;code&gt;y = f(x)&lt;/code&gt;, finds the y coordinate of the line given &lt;code&gt;t&lt;/code&gt;
+            <c>y = f(x)</c>, finds the y coordinate of the line given <c>t</c>
             as the x coordinate.</summary>
-        <returns>The y coordinate of the Path along the line where x = &lt;code&gt;t&lt;/code&gt;.</returns>
+        <returns>The y coordinate of the Path along the line where x = <c>t</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views.Autofill/AutofillId+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views.Autofill/AutofillId+InterfaceConsts.xml
index 308b71bb45..1f4c9a035e 100644
--- a/docs/Mono.Android/en/Android.Views.Autofill/AutofillId+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views.Autofill/AutofillId+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views.Autofill/AutofillValue+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views.Autofill/AutofillValue+InterfaceConsts.xml
index 35c9ce527c..f2464994a9 100644
--- a/docs/Mono.Android/en/Android.Views.Autofill/AutofillValue+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views.Autofill/AutofillValue+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views.ContentCaptures/ContentCaptureCondition+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views.ContentCaptures/ContentCaptureCondition+InterfaceConsts.xml
index f81c6213bc..e70554dff5 100644
--- a/docs/Mono.Android/en/Android.Views.ContentCaptures/ContentCaptureCondition+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views.ContentCaptures/ContentCaptureCondition+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views.ContentCaptures/ContentCaptureContext+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views.ContentCaptures/ContentCaptureContext+InterfaceConsts.xml
index b72348ff41..ba61a77f74 100644
--- a/docs/Mono.Android/en/Android.Views.ContentCaptures/ContentCaptureContext+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views.ContentCaptures/ContentCaptureContext+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views.ContentCaptures/ContentCaptureSessionId+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views.ContentCaptures/ContentCaptureSessionId+InterfaceConsts.xml
index 3043ce21ac..a2f79191ce 100644
--- a/docs/Mono.Android/en/Android.Views.ContentCaptures/ContentCaptureSessionId+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views.ContentCaptures/ContentCaptureSessionId+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views.ContentCaptures/DataRemovalRequest+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views.ContentCaptures/DataRemovalRequest+InterfaceConsts.xml
index 4af97692d2..8cf7e3147a 100644
--- a/docs/Mono.Android/en/Android.Views.ContentCaptures/DataRemovalRequest+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views.ContentCaptures/DataRemovalRequest+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views.ContentCaptures/DataShareRequest+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views.ContentCaptures/DataShareRequest+InterfaceConsts.xml
index 5cdc7cc20c..d06d498027 100644
--- a/docs/Mono.Android/en/Android.Views.ContentCaptures/DataShareRequest+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views.ContentCaptures/DataShareRequest+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views.DisplayHash/DisplayHash+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views.DisplayHash/DisplayHash+InterfaceConsts.xml
index 8d2f93088b..b2fdbb0d5b 100644
--- a/docs/Mono.Android/en/Android.Views.DisplayHash/DisplayHash+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views.DisplayHash/DisplayHash+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views.DisplayHash/VerifiedDisplayHash+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views.DisplayHash/VerifiedDisplayHash+InterfaceConsts.xml
index 1339d314d3..550496109b 100644
--- a/docs/Mono.Android/en/Android.Views.DisplayHash/VerifiedDisplayHash+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views.DisplayHash/VerifiedDisplayHash+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views.InputMethods/CompletionInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views.InputMethods/CompletionInfo+InterfaceConsts.xml
index 05c7ab14a1..bd618bf10f 100644
--- a/docs/Mono.Android/en/Android.Views.InputMethods/CompletionInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views.InputMethods/CompletionInfo+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views.InputMethods/CorrectionInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views.InputMethods/CorrectionInfo+InterfaceConsts.xml
index c29490f204..4c285547fa 100644
--- a/docs/Mono.Android/en/Android.Views.InputMethods/CorrectionInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views.InputMethods/CorrectionInfo+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views.InputMethods/CursorAnchorInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views.InputMethods/CursorAnchorInfo+InterfaceConsts.xml
index e2716dc23e..470e91668a 100644
--- a/docs/Mono.Android/en/Android.Views.InputMethods/CursorAnchorInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views.InputMethods/CursorAnchorInfo+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views.InputMethods/EditorInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views.InputMethods/EditorInfo+InterfaceConsts.xml
index 4d85d45c57..899cc0d544 100644
--- a/docs/Mono.Android/en/Android.Views.InputMethods/EditorInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views.InputMethods/EditorInfo+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views.InputMethods/ExtractedText+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views.InputMethods/ExtractedText+InterfaceConsts.xml
index adf337dffe..49597fddc5 100644
--- a/docs/Mono.Android/en/Android.Views.InputMethods/ExtractedText+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views.InputMethods/ExtractedText+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views.InputMethods/ExtractedTextRequest+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views.InputMethods/ExtractedTextRequest+InterfaceConsts.xml
index 793ac5de90..5363ddcc57 100644
--- a/docs/Mono.Android/en/Android.Views.InputMethods/ExtractedTextRequest+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views.InputMethods/ExtractedTextRequest+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views.InputMethods/InlineSuggestion+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views.InputMethods/InlineSuggestion+InterfaceConsts.xml
index 27dc7f47ad..0b64231600 100644
--- a/docs/Mono.Android/en/Android.Views.InputMethods/InlineSuggestion+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views.InputMethods/InlineSuggestion+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views.InputMethods/InlineSuggestionInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views.InputMethods/InlineSuggestionInfo+InterfaceConsts.xml
index 7bee1d067c..be59c97602 100644
--- a/docs/Mono.Android/en/Android.Views.InputMethods/InlineSuggestionInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views.InputMethods/InlineSuggestionInfo+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views.InputMethods/InlineSuggestionsRequest+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views.InputMethods/InlineSuggestionsRequest+InterfaceConsts.xml
index 4ec039213d..a53e05693d 100644
--- a/docs/Mono.Android/en/Android.Views.InputMethods/InlineSuggestionsRequest+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views.InputMethods/InlineSuggestionsRequest+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views.InputMethods/InlineSuggestionsResponse+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views.InputMethods/InlineSuggestionsResponse+InterfaceConsts.xml
index 3b0fc16e06..08cad7238a 100644
--- a/docs/Mono.Android/en/Android.Views.InputMethods/InlineSuggestionsResponse+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views.InputMethods/InlineSuggestionsResponse+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views.InputMethods/InputBinding+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views.InputMethods/InputBinding+InterfaceConsts.xml
index 8e5e587dfc..fef68a1421 100644
--- a/docs/Mono.Android/en/Android.Views.InputMethods/InputBinding+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views.InputMethods/InputBinding+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views.InputMethods/InputContentInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views.InputMethods/InputContentInfo+InterfaceConsts.xml
index 54770b6ac5..995e6acc5c 100644
--- a/docs/Mono.Android/en/Android.Views.InputMethods/InputContentInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views.InputMethods/InputContentInfo+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views.InputMethods/InputMethodInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views.InputMethods/InputMethodInfo+InterfaceConsts.xml
index ecc6351d95..9b4d8afbfd 100644
--- a/docs/Mono.Android/en/Android.Views.InputMethods/InputMethodInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views.InputMethods/InputMethodInfo+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views.InputMethods/InputMethodSubtype+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views.InputMethods/InputMethodSubtype+InterfaceConsts.xml
index 90c47fe340..6f25f4c4fb 100644
--- a/docs/Mono.Android/en/Android.Views.InputMethods/InputMethodSubtype+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views.InputMethods/InputMethodSubtype+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views.InputMethods/SurroundingText+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views.InputMethods/SurroundingText+InterfaceConsts.xml
index baae656ec5..0b790cd910 100644
--- a/docs/Mono.Android/en/Android.Views.InputMethods/SurroundingText+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views.InputMethods/SurroundingText+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views.TextClassifiers/ConversationAction+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views.TextClassifiers/ConversationAction+InterfaceConsts.xml
index fcf04bf5c3..f27e8b6aa9 100644
--- a/docs/Mono.Android/en/Android.Views.TextClassifiers/ConversationAction+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views.TextClassifiers/ConversationAction+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views.TextClassifiers/ConversationActions+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views.TextClassifiers/ConversationActions+InterfaceConsts.xml
index 3ff17bf229..1ca5a1549f 100644
--- a/docs/Mono.Android/en/Android.Views.TextClassifiers/ConversationActions+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views.TextClassifiers/ConversationActions+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views.TextClassifiers/ConversationActions+Message+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views.TextClassifiers/ConversationActions+Message+InterfaceConsts.xml
index 5e59bff26a..2ef2dadb14 100644
--- a/docs/Mono.Android/en/Android.Views.TextClassifiers/ConversationActions+Message+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views.TextClassifiers/ConversationActions+Message+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views.TextClassifiers/ConversationActions+Request+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views.TextClassifiers/ConversationActions+Request+InterfaceConsts.xml
index 0c88289615..5853540b0d 100644
--- a/docs/Mono.Android/en/Android.Views.TextClassifiers/ConversationActions+Request+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views.TextClassifiers/ConversationActions+Request+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views.TextClassifiers/SelectionEvent+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views.TextClassifiers/SelectionEvent+InterfaceConsts.xml
index 5581ecc386..5d8d3eec84 100644
--- a/docs/Mono.Android/en/Android.Views.TextClassifiers/SelectionEvent+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views.TextClassifiers/SelectionEvent+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views.TextClassifiers/TextClassification+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views.TextClassifiers/TextClassification+InterfaceConsts.xml
index 7cad94349e..0626d01f71 100644
--- a/docs/Mono.Android/en/Android.Views.TextClassifiers/TextClassification+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views.TextClassifiers/TextClassification+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views.TextClassifiers/TextClassification+Request+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views.TextClassifiers/TextClassification+Request+InterfaceConsts.xml
index 13ad4d2b9c..92827f4f8b 100644
--- a/docs/Mono.Android/en/Android.Views.TextClassifiers/TextClassification+Request+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views.TextClassifiers/TextClassification+Request+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views.TextClassifiers/TextClassificationContext+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views.TextClassifiers/TextClassificationContext+InterfaceConsts.xml
index 1cf982e710..4160829784 100644
--- a/docs/Mono.Android/en/Android.Views.TextClassifiers/TextClassificationContext+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views.TextClassifiers/TextClassificationContext+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views.TextClassifiers/TextClassificationSessionId+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views.TextClassifiers/TextClassificationSessionId+InterfaceConsts.xml
index dc85e95854..3aefbdc883 100644
--- a/docs/Mono.Android/en/Android.Views.TextClassifiers/TextClassificationSessionId+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views.TextClassifiers/TextClassificationSessionId+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views.TextClassifiers/TextClassifierEntityConfig+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views.TextClassifiers/TextClassifierEntityConfig+InterfaceConsts.xml
index 81ee7014ad..021dc88483 100644
--- a/docs/Mono.Android/en/Android.Views.TextClassifiers/TextClassifierEntityConfig+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views.TextClassifiers/TextClassifierEntityConfig+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views.TextClassifiers/TextClassifierEvent+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views.TextClassifiers/TextClassifierEvent+InterfaceConsts.xml
index 109021caba..6dec6a0e6b 100644
--- a/docs/Mono.Android/en/Android.Views.TextClassifiers/TextClassifierEvent+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views.TextClassifiers/TextClassifierEvent+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views.TextClassifiers/TextLanguage+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views.TextClassifiers/TextLanguage+InterfaceConsts.xml
index 3bdd45b8b7..c314fa9ca7 100644
--- a/docs/Mono.Android/en/Android.Views.TextClassifiers/TextLanguage+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views.TextClassifiers/TextLanguage+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views.TextClassifiers/TextLanguage+Request+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views.TextClassifiers/TextLanguage+Request+InterfaceConsts.xml
index 779665e59d..b3ed8105be 100644
--- a/docs/Mono.Android/en/Android.Views.TextClassifiers/TextLanguage+Request+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views.TextClassifiers/TextLanguage+Request+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views.TextClassifiers/TextLinks+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views.TextClassifiers/TextLinks+InterfaceConsts.xml
index 913855b543..b1c8ac174e 100644
--- a/docs/Mono.Android/en/Android.Views.TextClassifiers/TextLinks+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views.TextClassifiers/TextLinks+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views.TextClassifiers/TextLinks+Request+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views.TextClassifiers/TextLinks+Request+InterfaceConsts.xml
index 806616c783..b2b557c122 100644
--- a/docs/Mono.Android/en/Android.Views.TextClassifiers/TextLinks+Request+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views.TextClassifiers/TextLinks+Request+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views.TextClassifiers/TextLinks+TextLink+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views.TextClassifiers/TextLinks+TextLink+InterfaceConsts.xml
index 8af19f7326..7b9a948b5e 100644
--- a/docs/Mono.Android/en/Android.Views.TextClassifiers/TextLinks+TextLink+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views.TextClassifiers/TextLinks+TextLink+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views.TextClassifiers/TextSelection+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views.TextClassifiers/TextSelection+InterfaceConsts.xml
index 08b3af2b1d..ba6b17fc7e 100644
--- a/docs/Mono.Android/en/Android.Views.TextClassifiers/TextSelection+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views.TextClassifiers/TextSelection+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views.TextClassifiers/TextSelection+Request+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views.TextClassifiers/TextSelection+Request+InterfaceConsts.xml
index 6be57d8e62..8a42ebbf05 100644
--- a/docs/Mono.Android/en/Android.Views.TextClassifiers/TextSelection+Request+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views.TextClassifiers/TextSelection+Request+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views.TextService/SentenceSuggestionsInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views.TextService/SentenceSuggestionsInfo+InterfaceConsts.xml
index 8eadd7b4fa..6f254abc00 100644
--- a/docs/Mono.Android/en/Android.Views.TextService/SentenceSuggestionsInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views.TextService/SentenceSuggestionsInfo+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views.TextService/SpellCheckerInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views.TextService/SpellCheckerInfo+InterfaceConsts.xml
index b67b6b2aff..9e02a4abd2 100644
--- a/docs/Mono.Android/en/Android.Views.TextService/SpellCheckerInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views.TextService/SpellCheckerInfo+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views.TextService/SpellCheckerSubtype+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views.TextService/SpellCheckerSubtype+InterfaceConsts.xml
index b4e0b05c49..49169e12d0 100644
--- a/docs/Mono.Android/en/Android.Views.TextService/SpellCheckerSubtype+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views.TextService/SpellCheckerSubtype+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views.TextService/SuggestionsInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views.TextService/SuggestionsInfo+InterfaceConsts.xml
index 4093c05893..da3a180da3 100644
--- a/docs/Mono.Android/en/Android.Views.TextService/SuggestionsInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views.TextService/SuggestionsInfo+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views.TextService/TextInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views.TextService/TextInfo+InterfaceConsts.xml
index c597038589..b58c389740 100644
--- a/docs/Mono.Android/en/Android.Views.TextService/TextInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views.TextService/TextInfo+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views.Translation/TranslationCapability+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views.Translation/TranslationCapability+InterfaceConsts.xml
index 6090e4df95..9201ad201f 100644
--- a/docs/Mono.Android/en/Android.Views.Translation/TranslationCapability+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views.Translation/TranslationCapability+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views.Translation/TranslationContext+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views.Translation/TranslationContext+InterfaceConsts.xml
index c052e9b03b..dc283d3b98 100644
--- a/docs/Mono.Android/en/Android.Views.Translation/TranslationContext+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views.Translation/TranslationContext+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views.Translation/TranslationRequest+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views.Translation/TranslationRequest+InterfaceConsts.xml
index f281658df5..4447f647c2 100644
--- a/docs/Mono.Android/en/Android.Views.Translation/TranslationRequest+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views.Translation/TranslationRequest+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views.Translation/TranslationRequestValue+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views.Translation/TranslationRequestValue+InterfaceConsts.xml
index 780f08246a..147fe2e3dc 100644
--- a/docs/Mono.Android/en/Android.Views.Translation/TranslationRequestValue+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views.Translation/TranslationRequestValue+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views.Translation/TranslationResponse+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views.Translation/TranslationResponse+InterfaceConsts.xml
index 6bb172c437..9523607cd1 100644
--- a/docs/Mono.Android/en/Android.Views.Translation/TranslationResponse+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views.Translation/TranslationResponse+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views.Translation/TranslationResponseValue+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views.Translation/TranslationResponseValue+InterfaceConsts.xml
index d1325b78d4..5a095a2a1e 100644
--- a/docs/Mono.Android/en/Android.Views.Translation/TranslationResponseValue+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views.Translation/TranslationResponseValue+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views.Translation/TranslationSpec+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views.Translation/TranslationSpec+InterfaceConsts.xml
index 76a6858b25..dc7007ac44 100644
--- a/docs/Mono.Android/en/Android.Views.Translation/TranslationSpec+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views.Translation/TranslationSpec+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views.Translation/ViewTranslationRequest+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views.Translation/ViewTranslationRequest+InterfaceConsts.xml
index 28fc8f8c8a..970a9291a9 100644
--- a/docs/Mono.Android/en/Android.Views.Translation/ViewTranslationRequest+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views.Translation/ViewTranslationRequest+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views.Translation/ViewTranslationResponse+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views.Translation/ViewTranslationResponse+InterfaceConsts.xml
index a5a00fed7f..23d280aa03 100644
--- a/docs/Mono.Android/en/Android.Views.Translation/ViewTranslationResponse+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views.Translation/ViewTranslationResponse+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views/AbsSavedState+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views/AbsSavedState+InterfaceConsts.xml
index da2f744061..17e856bddd 100644
--- a/docs/Mono.Android/en/Android.Views/AbsSavedState+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views/AbsSavedState+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views/ContentInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views/ContentInfo+InterfaceConsts.xml
index 7638f83ba1..0a5f4d11b5 100644
--- a/docs/Mono.Android/en/Android.Views/ContentInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views/ContentInfo+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views/Display+HdrCapabilities+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views/Display+HdrCapabilities+InterfaceConsts.xml
index e657fd2472..50cd04e894 100644
--- a/docs/Mono.Android/en/Android.Views/Display+HdrCapabilities+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views/Display+HdrCapabilities+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views/Display+Mode+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views/Display+Mode+InterfaceConsts.xml
index 58d7b6cc9b..cd29ace1db 100644
--- a/docs/Mono.Android/en/Android.Views/Display+Mode+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views/Display+Mode+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views/DragAndDropPermissions+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views/DragAndDropPermissions+InterfaceConsts.xml
index dc6015d820..f2f61c8f2d 100644
--- a/docs/Mono.Android/en/Android.Views/DragAndDropPermissions+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views/DragAndDropPermissions+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views/DragEvent+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views/DragEvent+InterfaceConsts.xml
index a3e25a5bc1..76d9c8e962 100644
--- a/docs/Mono.Android/en/Android.Views/DragEvent+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views/DragEvent+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views/IViewParent.xml b/docs/Mono.Android/en/Android.Views/IViewParent.xml
index ac58ba27e3..1a754934f8 100644
--- a/docs/Mono.Android/en/Android.Views/IViewParent.xml
+++ b/docs/Mono.Android/en/Android.Views/IViewParent.xml
@@ -474,9 +474,9 @@
         <param name="r">The input rectangle, defined in the child coordinate system. Will be overwritten to
             contain the resulting visible rectangle, expressed in global (root) coordinates</param>
         <param name="offset">The input coordinates of a point, defined in the child coordinate system.
-            As with the &lt;code&gt;r&lt;/code&gt; parameter, this will be overwritten to contain the global (root)
+            As with the <c>r</c> parameter, this will be overwritten to contain the global (root)
             coordinates of that point.
-            A &lt;code&gt;null&lt;/code&gt; value is valid (in case you are not interested in this result)</param>
+            A <c>null</c> value is valid (in case you are not interested in this result)</param>
         <summary>Compute the visible part of a rectangular region defined in terms of a child view's
             coordinates.</summary>
         <returns>true if the resulting rectangle is not empty, false otherwise</returns>
diff --git a/docs/Mono.Android/en/Android.Views/InputDevice+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views/InputDevice+InterfaceConsts.xml
index 02e81f1497..b6dce26835 100644
--- a/docs/Mono.Android/en/Android.Views/InputDevice+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views/InputDevice+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views/InputEvent+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views/InputEvent+InterfaceConsts.xml
index 7783e8ead0..b868802bcc 100644
--- a/docs/Mono.Android/en/Android.Views/InputEvent+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views/InputEvent+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views/KeyCharacterMap+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views/KeyCharacterMap+InterfaceConsts.xml
index 393036fd47..1481a6c3db 100644
--- a/docs/Mono.Android/en/Android.Views/KeyCharacterMap+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views/KeyCharacterMap+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views/KeyboardShortcutGroup+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views/KeyboardShortcutGroup+InterfaceConsts.xml
index f06ab0eb53..1ac8999969 100644
--- a/docs/Mono.Android/en/Android.Views/KeyboardShortcutGroup+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views/KeyboardShortcutGroup+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views/KeyboardShortcutInfo+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views/KeyboardShortcutInfo+InterfaceConsts.xml
index 233f44648d..7425721f7e 100644
--- a/docs/Mono.Android/en/Android.Views/KeyboardShortcutInfo+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views/KeyboardShortcutInfo+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views/LayoutInflater.xml b/docs/Mono.Android/en/Android.Views/LayoutInflater.xml
index 9acc7f1f11..ac15629ad7 100644
--- a/docs/Mono.Android/en/Android.Views/LayoutInflater.xml
+++ b/docs/Mono.Android/en/Android.Views/LayoutInflater.xml
@@ -550,7 +550,7 @@
       </Parameters>
       <Docs>
         <param name="resource">ID for an XML layout resource to load (e.g.,
-                   &lt;code&gt;R.layout.main_page&lt;/code&gt;)</param>
+                   <c>R.layout.main_page</c>)</param>
         <param name="root">Optional view to be the parent of the generated hierarchy.</param>
         <summary>Inflate a new view hierarchy from the specified xml resource.</summary>
         <returns>The root View of the inflated hierarchy. If root was supplied,
@@ -643,7 +643,7 @@
       </Parameters>
       <Docs>
         <param name="resource">ID for an XML layout resource to load (e.g.,
-                   &lt;code&gt;R.layout.main_page&lt;/code&gt;)</param>
+                   <c>R.layout.main_page</c>)</param>
         <param name="root">Optional view to be the parent of the generated hierarchy (if
                    &lt;em&gt;attachToRoot&lt;/em&gt; is true), or else simply an object that
                    provides a set of LayoutParams values for root of the returned
diff --git a/docs/Mono.Android/en/Android.Views/MenuInflater.xml b/docs/Mono.Android/en/Android.Views/MenuInflater.xml
index 2c3d776c1e..85e4b88474 100644
--- a/docs/Mono.Android/en/Android.Views/MenuInflater.xml
+++ b/docs/Mono.Android/en/Android.Views/MenuInflater.xml
@@ -120,7 +120,7 @@
       </Parameters>
       <Docs>
         <param name="menuRes">Resource ID for an XML layout resource to load (e.g.,
-                       &lt;code&gt;R.menu.main_activity&lt;/code&gt;)</param>
+                       <c>R.menu.main_activity</c>)</param>
         <param name="menu">The Menu to inflate into. The items and submenus will be
                        added to this Menu.</param>
         <summary>Inflate a menu hierarchy from the specified XML resource.</summary>
diff --git a/docs/Mono.Android/en/Android.Views/PixelCopy+IOnPixelCopyFinishedListener.xml b/docs/Mono.Android/en/Android.Views/PixelCopy+IOnPixelCopyFinishedListener.xml
index 5100401db6..e7fd89bf20 100644
--- a/docs/Mono.Android/en/Android.Views/PixelCopy+IOnPixelCopyFinishedListener.xml
+++ b/docs/Mono.Android/en/Android.Views/PixelCopy+IOnPixelCopyFinishedListener.xml
@@ -65,7 +65,7 @@
       <Docs>
         <param name="copyResult">Contains the resulting status of the copy request.
             This will either be <c>PixelCopy#SUCCESS</c> or one of the
-            &lt;code&gt;PixelCopy.ERROR_*&lt;/code&gt; values.</param>
+            <c>PixelCopy.ERROR_*</c> values.</param>
         <summary>Callback for when a pixel copy request has completed.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Views/PointerIcon+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views/PointerIcon+InterfaceConsts.xml
index 0fda85f6f1..c9a6e32d2d 100644
--- a/docs/Mono.Android/en/Android.Views/PointerIcon+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views/PointerIcon+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views/RoundedCorner+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views/RoundedCorner+InterfaceConsts.xml
index f7ad441474..6d6b217fbc 100644
--- a/docs/Mono.Android/en/Android.Views/RoundedCorner+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views/RoundedCorner+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views/Surface+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views/Surface+InterfaceConsts.xml
index 9367372aec..ae6c5f1acd 100644
--- a/docs/Mono.Android/en/Android.Views/Surface+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views/Surface+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views/Surface.xml b/docs/Mono.Android/en/Android.Views/Surface.xml
index b8f9770915..b0d6ac1aa2 100644
--- a/docs/Mono.Android/en/Android.Views/Surface.xml
+++ b/docs/Mono.Android/en/Android.Views/Surface.xml
@@ -623,7 +623,7 @@
             the surface has been resized or if the previous contents of the surface were
             not available.  The caller must redraw the entire dirty region as represented
             by the contents of the inOutDirty rectangle upon return from this function.
-            The caller may also pass &lt;code&gt;null&lt;/code&gt; instead, in the case where the
+            The caller may also pass <c>null</c> instead, in the case where the
             entire surface should be redrawn.</param>
         <summary>Gets a <c>Canvas</c> for drawing into this surface.</summary>
         <returns>A canvas for drawing into the surface.</returns>
@@ -991,16 +991,16 @@
         <param name="frameRate">The intended frame rate of this surface, in frames per second. 0
             is a special value that indicates the app will accept the system's choice for the
             display frame rate, which is the default behavior if this function isn't
-            called. The &lt;code&gt;frameRate&lt;/code&gt; parameter does &lt;em&gt;not&lt;/em&gt; need to be a valid refresh
+            called. The <c>frameRate</c> parameter does &lt;em&gt;not&lt;/em&gt; need to be a valid refresh
             rate for this device's display - e.g., it's fine to pass 30fps to a device that can only run
             the display at 60fps.</param>
         <param name="compatibility">The frame rate compatibility of this surface. The
             compatibility value may influence the system's choice of display frame rate.
-            This parameter is ignored when &lt;code&gt;frameRate&lt;/code&gt; is 0.</param>
+            This parameter is ignored when <c>frameRate</c> is 0.</param>
         <param name="changeFrameRateStrategy">Whether display refresh rate transitions caused by this
             surface should be seamless. A seamless transition is one that doesn't have any visual
             interruptions, such as a black screen for a second or two. This parameter is ignored when
-            &lt;code&gt;frameRate&lt;/code&gt; is 0.</param>
+            <c>frameRate</c> is 0.</param>
         <summary>Sets the intended frame rate for this surface.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Views/SurfaceControl+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views/SurfaceControl+InterfaceConsts.xml
index 0e317b2d8b..cdf5686365 100644
--- a/docs/Mono.Android/en/Android.Views/SurfaceControl+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views/SurfaceControl+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views/SurfaceControl+Transaction+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views/SurfaceControl+Transaction+InterfaceConsts.xml
index aba8014380..6abda2a5cf 100644
--- a/docs/Mono.Android/en/Android.Views/SurfaceControl+Transaction+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views/SurfaceControl+Transaction+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views/SurfaceControlViewHost+SurfacePackage+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views/SurfaceControlViewHost+SurfacePackage+InterfaceConsts.xml
index 72a0abfd91..6013a6b641 100644
--- a/docs/Mono.Android/en/Android.Views/SurfaceControlViewHost+SurfacePackage+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views/SurfaceControlViewHost+SurfacePackage+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views/SurfaceControlViewHost.xml b/docs/Mono.Android/en/Android.Views/SurfaceControlViewHost.xml
index abe00167f5..44d4d990be 100644
--- a/docs/Mono.Android/en/Android.Views/SurfaceControlViewHost.xml
+++ b/docs/Mono.Android/en/Android.Views/SurfaceControlViewHost.xml
@@ -76,9 +76,6 @@
         <Parameter Name="hostToken" Type="Android.OS.IBinder" />
       </Parameters>
       <Docs>
-        <param name="hostToken}}">parameter, primarily used for ANR reporting,
-            must be obtained from whomever will be hosting the embedded hierarchy.
-            It's accessible from <c>SurfaceView#getHostToken</c>.</param>
         <param name="context">The Context object for your activity or application.</param>
         <param name="display">The Display the hierarchy will be placed on.</param>
         <param name="hostToken">The host token, as discussed above.</param>
diff --git a/docs/Mono.Android/en/Android.Views/VerifiedInputEvent+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views/VerifiedInputEvent+InterfaceConsts.xml
index dedc01b581..f5bf817761 100644
--- a/docs/Mono.Android/en/Android.Views/VerifiedInputEvent+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views/VerifiedInputEvent+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views/View.xml b/docs/Mono.Android/en/Android.Views/View.xml
index c93b3b1563..af47db4133 100644
--- a/docs/Mono.Android/en/Android.Views/View.xml
+++ b/docs/Mono.Android/en/Android.Views/View.xml
@@ -3036,7 +3036,7 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Calling this method is equivalent to calling &lt;code&gt;buildDrawingCache(false)&lt;/code&gt;.</summary>
+        <summary>Calling this method is equivalent to calling <c>buildDrawingCache(false)</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -7098,7 +7098,7 @@
         <ReturnType>Android.Graphics.Bitmap</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Calling this method is equivalent to calling &lt;code&gt;getDrawingCache(false)&lt;/code&gt;.</summary>
+        <summary>Calling this method is equivalent to calling <c>getDrawingCache(false)</c>.</summary>
         <value>A non-scaled bitmap representing this view or null if cache is disabled.</value>
         <remarks>
           <para>
@@ -16214,7 +16214,7 @@
         <param name="previouslyFocusedRect">The rectangle, in this view's coordinate
                    system, of the previously focused view.  If applicable, this will be
                    passed in as finer grained information about where the focus is coming
-                   from (in addition to direction).  Will be &lt;code&gt;null&lt;/code&gt; otherwise.</param>
+                   from (in addition to direction).  Will be <c>null</c> otherwise.</param>
         <summary>Called by the view system when the focus state of this view changes.</summary>
         <remarks>
           <para>
@@ -22526,7 +22526,7 @@
         <ReturnType>Android.Util.Property</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>A Property wrapper around the &lt;code&gt;scaleX&lt;/code&gt; functionality handled by the
+        <summary>A Property wrapper around the <c>scaleX</c> functionality handled by the
             <c>View#setScaleX(float)</c> and <c>View#getScaleX()</c> methods.</summary>
         <value>To be added.</value>
         <remarks>
@@ -22619,7 +22619,7 @@
         <ReturnType>Android.Util.Property</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>A Property wrapper around the &lt;code&gt;scaleY&lt;/code&gt; functionality handled by the
+        <summary>A Property wrapper around the <c>scaleY</c> functionality handled by the
             <c>View#setScaleY(float)</c> and <c>View#getScaleY()</c> methods.</summary>
         <value>To be added.</value>
         <remarks>
@@ -30113,7 +30113,7 @@
         <ReturnType>Android.Util.Property</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>A Property wrapper around the &lt;code&gt;x&lt;/code&gt; functionality handled by the
+        <summary>A Property wrapper around the <c>x</c> functionality handled by the
             <c>View#setX(float)</c> and <c>View#getX()</c> methods.</summary>
         <value>To be added.</value>
         <remarks>
@@ -30151,7 +30151,7 @@
         <ReturnType>Android.Util.Property</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>A Property wrapper around the &lt;code&gt;y&lt;/code&gt; functionality handled by the
+        <summary>A Property wrapper around the <c>y</c> functionality handled by the
             <c>View#setY(float)</c> and <c>View#getY()</c> methods.</summary>
         <value>To be added.</value>
         <remarks>
@@ -30189,7 +30189,7 @@
         <ReturnType>Android.Util.Property</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>A Property wrapper around the &lt;code&gt;z&lt;/code&gt; functionality handled by the
+        <summary>A Property wrapper around the <c>z</c> functionality handled by the
             <c>View#setZ(float)</c> and <c>View#getZ()</c> methods.</summary>
         <value>To be added.</value>
         <remarks>
diff --git a/docs/Mono.Android/en/Android.Views/ViewAnimationUtils.xml b/docs/Mono.Android/en/Android.Views/ViewAnimationUtils.xml
index cb0c722bfb..5e1e4bb25b 100644
--- a/docs/Mono.Android/en/Android.Views/ViewAnimationUtils.xml
+++ b/docs/Mono.Android/en/Android.Views/ViewAnimationUtils.xml
@@ -62,9 +62,9 @@
       <Docs>
         <param name="view">The View will be clipped to the animating circle.</param>
         <param name="centerX">The x coordinate of the center of the animating circle, relative to
-                           &lt;code&gt;view&lt;/code&gt;.</param>
+                           <c>view</c>.</param>
         <param name="centerY">The y coordinate of the center of the animating circle, relative to
-                           &lt;code&gt;view&lt;/code&gt;.</param>
+                           <c>view</c>.</param>
         <param name="startRadius">The starting radius of the animating circle.</param>
         <param name="endRadius">The ending radius of the animating circle.</param>
         <summary>Returns an Animator which can animate a clipping circle.</summary>
diff --git a/docs/Mono.Android/en/Android.Views/ViewDebug+FlagToString.xml b/docs/Mono.Android/en/Android.Views/ViewDebug+FlagToString.xml
index 78ac3181fe..ab6c49790c 100644
--- a/docs/Mono.Android/en/Android.Views/ViewDebug+FlagToString.xml
+++ b/docs/Mono.Android/en/Android.Views/ViewDebug+FlagToString.xml
@@ -136,7 +136,7 @@
       <Parameters />
       <Docs>
         <summary>The value to compare to the result of:
-            &lt;code&gt;original value &amp;amp; <c>#mask()</c>&lt;/code&gt;.</summary>
+            <c>original value &amp;amp; <c>#mask()</c></c>.</summary>
         <returns>An arbitrary value.</returns>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Views/ViewGroup.xml b/docs/Mono.Android/en/Android.Views/ViewGroup.xml
index 471acfe461..80ccd93351 100644
--- a/docs/Mono.Android/en/Android.Views/ViewGroup.xml
+++ b/docs/Mono.Android/en/Android.Views/ViewGroup.xml
@@ -34,7 +34,7 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>A &lt;code&gt;ViewGroup&lt;/code&gt; is a special view that can contain other views
+    <summary>A <c>ViewGroup</c> is a special view that can contain other views
             (called children.</summary>
     <remarks>
       <para>
@@ -2429,7 +2429,7 @@
       <Docs>
         <param name="child">The child view whose static transform is being requested</param>
         <param name="t">The Transformation which will hold the result</param>
-        <summary>Sets  &lt;code&gt;t&lt;/code&gt; to be the static transformation of the child, if set, returning a
+        <summary>Sets  <c>t</c> to be the static transformation of the child, if set, returning a
             boolean to indicate whether a static transform was set.</summary>
         <returns>true if the transformation was set, false otherwise</returns>
         <remarks>
@@ -3015,10 +3015,10 @@
       </ReturnValue>
       <Docs>
         <param name="transition">The LayoutTransition object that will animated changes in layout. A value
-            of &lt;code&gt;null&lt;/code&gt; means no transition will run on layout changes.</param>
+            of <c>null</c> means no transition will run on layout changes.</param>
         <summary>Gets the LayoutTransition object for this ViewGroup. -or- Sets the LayoutTransition object for this ViewGroup.</summary>
         <value>LayoutTranstion The LayoutTransition object that will animated changes in layout.
-            A value of &lt;code&gt;null&lt;/code&gt; means no transition will run on layout changes.</value>
+            A value of <c>null</c> means no transition will run on layout changes.</value>
         <remarks>
           <para>Property getter documentation:</para>
           <para>
@@ -3205,8 +3205,9 @@
         <ReturnType>System.Boolean</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="split">&lt;code&gt;true&lt;/code&gt; to allow MotionEvents to be split and dispatched to multiple
-                         child views. &lt;code&gt;false&lt;/code&gt; to only allow one child view to be the target of
+        <param name="split">
+          <c>true</c> to allow MotionEvents to be split and dispatched to multiple
+                         child views. <c>false</c> to only allow one child view to be the target of
                          any MotionEvent received by this ViewGroup.</param>
         <summary>Returns true if MotionEvents dispatched to this ViewGroup can be split to multiple children. -or- Enable or disable the splitting of MotionEvents to multiple children during touch event
             dispatch.</summary>
diff --git a/docs/Mono.Android/en/Android.Views/ViewOutlineProvider.xml b/docs/Mono.Android/en/Android.Views/ViewOutlineProvider.xml
index 3cef051bd9..4f144dc50e 100644
--- a/docs/Mono.Android/en/Android.Views/ViewOutlineProvider.xml
+++ b/docs/Mono.Android/en/Android.Views/ViewOutlineProvider.xml
@@ -140,7 +140,7 @@
       </ReturnValue>
       <Docs>
         <summary>Maintains the outline of the View to match its rectangular bounds,
-            at &lt;code&gt;1.</summary>
+            at <c>1.0f</c> alpha.</summary>
         <value>To be added.</value>
         <remarks>
           <para>
@@ -249,7 +249,7 @@
       </ReturnValue>
       <Docs>
         <summary>Maintains the outline of the View to match its rectangular padded bounds,
-            at &lt;code&gt;1.</summary>
+            at <c>1.0f</c> alpha.</summary>
         <value>To be added.</value>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Views/ViewPropertyAnimator.xml b/docs/Mono.Android/en/Android.Views/ViewPropertyAnimator.xml
index 04f3557adc..a5176d0431 100644
--- a/docs/Mono.Android/en/Android.Views/ViewPropertyAnimator.xml
+++ b/docs/Mono.Android/en/Android.Views/ViewPropertyAnimator.xml
@@ -81,7 +81,7 @@
       </Parameters>
       <Docs>
         <param name="value">The value to be animated to.</param>
-        <summary>This method will cause the View's &lt;code&gt;alpha&lt;/code&gt; property to be animated to the
+        <summary>This method will cause the View's <c>alpha</c> property to be animated to the
             specified value.</summary>
         <returns>This object, allowing calls to methods in this class to be chained.</returns>
         <remarks>
@@ -124,7 +124,7 @@
       </Parameters>
       <Docs>
         <param name="value">The amount to be animated by, as an offset from the current value.</param>
-        <summary>This method will cause the View's &lt;code&gt;alpha&lt;/code&gt; property to be animated by the
+        <summary>This method will cause the View's <c>alpha</c> property to be animated by the
             specified value.</summary>
         <returns>This object, allowing calls to methods in this class to be chained.</returns>
         <remarks>
@@ -310,7 +310,7 @@
       </Parameters>
       <Docs>
         <param name="value">The value to be animated to.</param>
-        <summary>This method will cause the View's &lt;code&gt;rotation&lt;/code&gt; property to be animated to the
+        <summary>This method will cause the View's <c>rotation</c> property to be animated to the
             specified value.</summary>
         <returns>This object, allowing calls to methods in this class to be chained.</returns>
         <remarks>
@@ -353,7 +353,7 @@
       </Parameters>
       <Docs>
         <param name="value">The amount to be animated by, as an offset from the current value.</param>
-        <summary>This method will cause the View's &lt;code&gt;rotation&lt;/code&gt; property to be animated by the
+        <summary>This method will cause the View's <c>rotation</c> property to be animated by the
             specified value.</summary>
         <returns>This object, allowing calls to methods in this class to be chained.</returns>
         <remarks>
@@ -396,7 +396,7 @@
       </Parameters>
       <Docs>
         <param name="value">The value to be animated to.</param>
-        <summary>This method will cause the View's &lt;code&gt;rotationX&lt;/code&gt; property to be animated to the
+        <summary>This method will cause the View's <c>rotationX</c> property to be animated to the
             specified value.</summary>
         <returns>This object, allowing calls to methods in this class to be chained.</returns>
         <remarks>
@@ -439,7 +439,7 @@
       </Parameters>
       <Docs>
         <param name="value">The amount to be animated by, as an offset from the current value.</param>
-        <summary>This method will cause the View's &lt;code&gt;rotationX&lt;/code&gt; property to be animated by the
+        <summary>This method will cause the View's <c>rotationX</c> property to be animated by the
             specified value.</summary>
         <returns>This object, allowing calls to methods in this class to be chained.</returns>
         <remarks>
@@ -482,7 +482,7 @@
       </Parameters>
       <Docs>
         <param name="value">The value to be animated to.</param>
-        <summary>This method will cause the View's &lt;code&gt;rotationY&lt;/code&gt; property to be animated to the
+        <summary>This method will cause the View's <c>rotationY</c> property to be animated to the
             specified value.</summary>
         <returns>This object, allowing calls to methods in this class to be chained.</returns>
         <remarks>
@@ -525,7 +525,7 @@
       </Parameters>
       <Docs>
         <param name="value">The amount to be animated by, as an offset from the current value.</param>
-        <summary>This method will cause the View's &lt;code&gt;rotationY&lt;/code&gt; property to be animated by the
+        <summary>This method will cause the View's <c>rotationY</c> property to be animated by the
             specified value.</summary>
         <returns>This object, allowing calls to methods in this class to be chained.</returns>
         <remarks>
@@ -568,7 +568,7 @@
       </Parameters>
       <Docs>
         <param name="value">The value to be animated to.</param>
-        <summary>This method will cause the View's &lt;code&gt;scaleX&lt;/code&gt; property to be animated to the
+        <summary>This method will cause the View's <c>scaleX</c> property to be animated to the
             specified value.</summary>
         <returns>This object, allowing calls to methods in this class to be chained.</returns>
         <remarks>
@@ -611,7 +611,7 @@
       </Parameters>
       <Docs>
         <param name="value">The amount to be animated by, as an offset from the current value.</param>
-        <summary>This method will cause the View's &lt;code&gt;scaleX&lt;/code&gt; property to be animated by the
+        <summary>This method will cause the View's <c>scaleX</c> property to be animated by the
             specified value.</summary>
         <returns>This object, allowing calls to methods in this class to be chained.</returns>
         <remarks>
@@ -654,7 +654,7 @@
       </Parameters>
       <Docs>
         <param name="value">The value to be animated to.</param>
-        <summary>This method will cause the View's &lt;code&gt;scaleY&lt;/code&gt; property to be animated to the
+        <summary>This method will cause the View's <c>scaleY</c> property to be animated to the
             specified value.</summary>
         <returns>This object, allowing calls to methods in this class to be chained.</returns>
         <remarks>
@@ -697,7 +697,7 @@
       </Parameters>
       <Docs>
         <param name="value">The amount to be animated by, as an offset from the current value.</param>
-        <summary>This method will cause the View's &lt;code&gt;scaleY&lt;/code&gt; property to be animated by the
+        <summary>This method will cause the View's <c>scaleY</c> property to be animated by the
             specified value.</summary>
         <returns>This object, allowing calls to methods in this class to be chained.</returns>
         <remarks>
@@ -782,7 +782,7 @@
       </Parameters>
       <Docs>
         <param name="interpolator">The TimeInterpolator to be used for ensuing property animations. A value
-            of &lt;code&gt;null&lt;/code&gt; will result in linear interpolation.</param>
+            of <c>null</c> will result in linear interpolation.</param>
         <summary>Sets the interpolator for the underlying animator that animates the requested properties.</summary>
         <returns>This object, allowing calls to methods in this class to be chained.</returns>
         <remarks>
@@ -1088,7 +1088,7 @@
       </Parameters>
       <Docs>
         <param name="value">The value to be animated to.</param>
-        <summary>This method will cause the View's &lt;code&gt;translationX&lt;/code&gt; property to be animated to the
+        <summary>This method will cause the View's <c>translationX</c> property to be animated to the
             specified value.</summary>
         <returns>This object, allowing calls to methods in this class to be chained.</returns>
         <remarks>
@@ -1131,7 +1131,7 @@
       </Parameters>
       <Docs>
         <param name="value">The amount to be animated by, as an offset from the current value.</param>
-        <summary>This method will cause the View's &lt;code&gt;translationX&lt;/code&gt; property to be animated by the
+        <summary>This method will cause the View's <c>translationX</c> property to be animated by the
             specified value.</summary>
         <returns>This object, allowing calls to methods in this class to be chained.</returns>
         <remarks>
@@ -1174,7 +1174,7 @@
       </Parameters>
       <Docs>
         <param name="value">The value to be animated to.</param>
-        <summary>This method will cause the View's &lt;code&gt;translationY&lt;/code&gt; property to be animated to the
+        <summary>This method will cause the View's <c>translationY</c> property to be animated to the
             specified value.</summary>
         <returns>This object, allowing calls to methods in this class to be chained.</returns>
         <remarks>
@@ -1217,7 +1217,7 @@
       </Parameters>
       <Docs>
         <param name="value">The amount to be animated by, as an offset from the current value.</param>
-        <summary>This method will cause the View's &lt;code&gt;translationY&lt;/code&gt; property to be animated by the
+        <summary>This method will cause the View's <c>translationY</c> property to be animated by the
             specified value.</summary>
         <returns>This object, allowing calls to methods in this class to be chained.</returns>
         <remarks>
@@ -1260,7 +1260,7 @@
       </Parameters>
       <Docs>
         <param name="value">The value to be animated to.</param>
-        <summary>This method will cause the View's &lt;code&gt;translationZ&lt;/code&gt; property to be animated to the
+        <summary>This method will cause the View's <c>translationZ</c> property to be animated to the
             specified value.</summary>
         <returns>This object, allowing calls to methods in this class to be chained.</returns>
         <remarks>
@@ -1303,7 +1303,7 @@
       </Parameters>
       <Docs>
         <param name="value">The amount to be animated by, as an offset from the current value.</param>
-        <summary>This method will cause the View's &lt;code&gt;translationZ&lt;/code&gt; property to be animated by the
+        <summary>This method will cause the View's <c>translationZ</c> property to be animated by the
             specified value.</summary>
         <returns>This object, allowing calls to methods in this class to be chained.</returns>
         <remarks>
@@ -1468,7 +1468,7 @@
       </Parameters>
       <Docs>
         <param name="value">The value to be animated to.</param>
-        <summary>This method will cause the View's &lt;code&gt;x&lt;/code&gt; property to be animated to the
+        <summary>This method will cause the View's <c>x</c> property to be animated to the
             specified value.</summary>
         <returns>This object, allowing calls to methods in this class to be chained.</returns>
         <remarks>
@@ -1511,7 +1511,7 @@
       </Parameters>
       <Docs>
         <param name="value">The amount to be animated by, as an offset from the current value.</param>
-        <summary>This method will cause the View's &lt;code&gt;x&lt;/code&gt; property to be animated by the
+        <summary>This method will cause the View's <c>x</c> property to be animated by the
             specified value.</summary>
         <returns>This object, allowing calls to methods in this class to be chained.</returns>
         <remarks>
@@ -1554,7 +1554,7 @@
       </Parameters>
       <Docs>
         <param name="value">The value to be animated to.</param>
-        <summary>This method will cause the View's &lt;code&gt;y&lt;/code&gt; property to be animated to the
+        <summary>This method will cause the View's <c>y</c> property to be animated to the
             specified value.</summary>
         <returns>This object, allowing calls to methods in this class to be chained.</returns>
         <remarks>
@@ -1597,7 +1597,7 @@
       </Parameters>
       <Docs>
         <param name="value">The amount to be animated by, as an offset from the current value.</param>
-        <summary>This method will cause the View's &lt;code&gt;y&lt;/code&gt; property to be animated by the
+        <summary>This method will cause the View's <c>y</c> property to be animated by the
             specified value.</summary>
         <returns>This object, allowing calls to methods in this class to be chained.</returns>
         <remarks>
@@ -1640,7 +1640,7 @@
       </Parameters>
       <Docs>
         <param name="value">The value to be animated to.</param>
-        <summary>This method will cause the View's &lt;code&gt;z&lt;/code&gt; property to be animated to the
+        <summary>This method will cause the View's <c>z</c> property to be animated to the
             specified value.</summary>
         <returns>This object, allowing calls to methods in this class to be chained.</returns>
         <remarks>
@@ -1682,7 +1682,7 @@
       </Parameters>
       <Docs>
         <param name="value">The amount to be animated by, as an offset from the current value.</param>
-        <summary>This method will cause the View's &lt;code&gt;z&lt;/code&gt; property to be animated by the
+        <summary>This method will cause the View's <c>z</c> property to be animated by the
             specified value.</summary>
         <returns>This object, allowing calls to methods in this class to be chained.</returns>
         <remarks>
diff --git a/docs/Mono.Android/en/Android.Views/ViewStructure.xml b/docs/Mono.Android/en/Android.Views/ViewStructure.xml
index 8514ed94b3..0a614a828d 100644
--- a/docs/Mono.Android/en/Android.Views/ViewStructure.xml
+++ b/docs/Mono.Android/en/Android.Views/ViewStructure.xml
@@ -18,7 +18,8 @@
     </Attribute>
   </Attributes>
   <Docs>
-    <summary>&lt;code&gt;ViewStructure&lt;/code&gt; is a container for storing additional
+    <summary>
+      <c>ViewStructure</c> is a container for storing additional
             per-view data generated by <c>View#onProvideStructure
             View.onProvideStructure</c> and <c>View#onProvideAutofillStructure
             View.onProvideAutofillStructure</c>.</summary>
diff --git a/docs/Mono.Android/en/Android.Views/Window.xml b/docs/Mono.Android/en/Android.Views/Window.xml
index ec3f7875ad..786279a0fd 100644
--- a/docs/Mono.Android/en/Android.Views/Window.xml
+++ b/docs/Mono.Android/en/Android.Views/Window.xml
@@ -4183,19 +4183,7 @@
       </Parameters>
       <Docs>
         <param name="color">To be added.</param>
-        <param name="color}.}.">For this to take effect,
-            the window must be drawing the system bar backgrounds with
-            <c>android.view.WindowManager.LayoutParams#FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS</c> and
-            <c>android.view.WindowManager.LayoutParams#FLAG_TRANSLUCENT_NAVIGATION</c> must not be set.
-            
-            If {</param>
-        <param name="color}}">is not opaque, consider setting
-            <c>android.view.View#SYSTEM_UI_FLAG_LAYOUT_STABLE</c> and
-            <c>android.view.View#SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION</c>.
-            &lt;p&gt;
-            The transitionName for the view background will be "android:navigation:background".
-            &lt;/p&gt;</param>
-        <summary>Sets the color of the navigation bar to {</summary>
+        <summary>Sets the color of the navigation bar to <paramref>color</paramref>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -5053,14 +5041,16 @@
         <ReturnType>System.Boolean</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="sharedElementsUseOverlay">&lt;code&gt;true&lt;/code&gt; indicates that shared elements should
-                                            be transitioned with an Overlay or &lt;code&gt;false&lt;/code&gt;
+        <param name="sharedElementsUseOverlay">
+          <c>true</c> indicates that shared elements should
+                                            be transitioned with an Overlay or <c>false</c>
                                             to transition within the normal View hierarchy.</param>
-        <summary>Returns &lt;code&gt;true&lt;/code&gt; when shared elements should use an Overlay during
-            shared element transitions or &lt;code&gt;false&lt;/code&gt; when they should animate as
+        <summary>Returns <c>true</c> when shared elements should use an Overlay during
+            shared element transitions or <c>false</c> when they should animate as
             part of the normal View hierarchy. -or- Sets whether or not shared elements should use an Overlay during shared element transitions.</summary>
-        <value>&lt;code&gt;true&lt;/code&gt; when shared elements should use an Overlay during
-            shared element transitions or &lt;code&gt;false&lt;/code&gt; when they should animate as
+        <value>
+          <c>true</c> when shared elements should use an Overlay during
+            shared element transitions or <c>false</c> when they should animate as
             part of the normal View hierarchy.</value>
         <remarks>
           <para>Property getter documentation:</para>
diff --git a/docs/Mono.Android/en/Android.Views/WindowAnimationFrameStats+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views/WindowAnimationFrameStats+InterfaceConsts.xml
index a942fb8859..c3120d31af 100644
--- a/docs/Mono.Android/en/Android.Views/WindowAnimationFrameStats+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views/WindowAnimationFrameStats+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views/WindowContentFrameStats+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views/WindowContentFrameStats+InterfaceConsts.xml
index 248f2d0f7f..214667759f 100644
--- a/docs/Mono.Android/en/Android.Views/WindowContentFrameStats+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views/WindowContentFrameStats+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views/WindowId+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views/WindowId+InterfaceConsts.xml
index b45371331a..2172d98fb9 100644
--- a/docs/Mono.Android/en/Android.Views/WindowId+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views/WindowId+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Views/WindowManagerLayoutParams+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Views/WindowManagerLayoutParams+InterfaceConsts.xml
index 15f6bc829b..dddabb7224 100644
--- a/docs/Mono.Android/en/Android.Views/WindowManagerLayoutParams+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Views/WindowManagerLayoutParams+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Webkit/WebSettings.xml b/docs/Mono.Android/en/Android.Webkit/WebSettings.xml
index e2156081e9..bc80342fe2 100644
--- a/docs/Mono.Android/en/Android.Webkit/WebSettings.xml
+++ b/docs/Mono.Android/en/Android.Webkit/WebSettings.xml
@@ -1841,6 +1841,8 @@
         <ReturnType>System.Boolean</ReturnType>
       </ReturnValue>
       <Docs>
+        <param name="flag">
+          <c>true</c> if plugins should be enabled</param>
         <summary>Gets whether plugins are enabled. -or- Sets whether the WebView should enable plugins.</summary>
         <value>
           <c>true</c> if plugins are enabled</value>
@@ -1893,6 +1895,7 @@
         <ReturnType>System.String</ReturnType>
       </ReturnValue>
       <Docs>
+        <param name="pluginsPath">a String path to the directory containing plugins</param>
         <summary>Gets the directory that contains the plugin libraries. -or- Sets a custom path to plugins used by the WebView.</summary>
         <value>an empty string</value>
         <remarks>
@@ -2925,6 +2928,7 @@
         <ReturnType>System.Int32</ReturnType>
       </ReturnValue>
       <Docs>
+        <param name="ua">the integer code for the user-agent string</param>
         <summary>Gets the user-agent as an integer code. -or- Sets the user-agent string using an integer code.</summary>
         <value>the integer code for the user-agent string</value>
         <remarks>
diff --git a/docs/Mono.Android/en/Android.Widget.Inline/InlinePresentationSpec+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Widget.Inline/InlinePresentationSpec+InterfaceConsts.xml
index 16ad1da5a8..8d5e07934e 100644
--- a/docs/Mono.Android/en/Android.Widget.Inline/InlinePresentationSpec+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Widget.Inline/InlinePresentationSpec+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Widget/AbsListView+IMultiChoiceModeListener.xml b/docs/Mono.Android/en/Android.Widget/AbsListView+IMultiChoiceModeListener.xml
index 3546eb92f3..fab320cd7a 100644
--- a/docs/Mono.Android/en/Android.Widget/AbsListView+IMultiChoiceModeListener.xml
+++ b/docs/Mono.Android/en/Android.Widget/AbsListView+IMultiChoiceModeListener.xml
@@ -73,7 +73,8 @@
         <param name="mode">The <c>ActionMode</c> providing the selection mode</param>
         <param name="position">Adapter position of the item that was checked or unchecked</param>
         <param name="id">Adapter ID of the item that was checked or unchecked</param>
-        <param name="checked">&lt;code&gt;true&lt;/code&gt; if the item is now checked, &lt;code&gt;false&lt;/code&gt;
+        <param name="checked">
+          <c>true</c> if the item is now checked, <c>false</c>
                            if the item is now unchecked.</param>
         <summary>Called when an item is checked or unchecked during selection mode.</summary>
         <remarks>
diff --git a/docs/Mono.Android/en/Android.Widget/AbsListView.xml b/docs/Mono.Android/en/Android.Widget/AbsListView.xml
index f377226157..f2f2971208 100644
--- a/docs/Mono.Android/en/Android.Widget/AbsListView.xml
+++ b/docs/Mono.Android/en/Android.Widget/AbsListView.xml
@@ -607,7 +607,7 @@
         <summary>Returns the set of checked items in the list.</summary>
         <value>A SparseBooleanArray which will return true for each call to
                      get(int position) where position is a checked position in the
-                     list and false otherwise, or &lt;code&gt;null&lt;/code&gt; if the choice
+                     list and false otherwise, or <c>null</c> if the choice
                      mode is set to <c>#CHOICE_MODE_NONE</c>.</value>
         <remarks>
           <para>
@@ -1164,7 +1164,7 @@
       <Docs>
         <param name="position">The item whose checked state to return</param>
         <summary>Returns the checked state of the specified position.</summary>
-        <returns>The item's checked state or &lt;code&gt;false&lt;/code&gt; if choice mode
+        <returns>The item's checked state or <c>false</c> if choice mode
                     is invalid</returns>
         <remarks>
           <para>
@@ -3017,7 +3017,7 @@
       </Parameters>
       <Docs>
         <param name="position">Position to scroll to</param>
-        <param name="offset">Desired distance in pixels of &lt;code&gt;position&lt;/code&gt; from the top
+        <param name="offset">Desired distance in pixels of <c>position</c> from the top
                           of the view when scrolling is finished</param>
         <summary>Smoothly scroll to the specified adapter position.</summary>
         <remarks>
@@ -3061,7 +3061,7 @@
       </Parameters>
       <Docs>
         <param name="position">Position to scroll to</param>
-        <param name="offset">Desired distance in pixels of &lt;code&gt;position&lt;/code&gt; from the top
+        <param name="offset">Desired distance in pixels of <c>position</c> from the top
                           of the view when scrolling is finished</param>
         <param name="duration">Number of milliseconds to use for the scroll</param>
         <summary>Smoothly scroll to the specified adapter position.</summary>
diff --git a/docs/Mono.Android/en/Android.Widget/ActionMenuView+IOnMenuItemClickListener.xml b/docs/Mono.Android/en/Android.Widget/ActionMenuView+IOnMenuItemClickListener.xml
index 1e96d5e48a..cb3043619e 100644
--- a/docs/Mono.Android/en/Android.Widget/ActionMenuView+IOnMenuItemClickListener.xml
+++ b/docs/Mono.Android/en/Android.Widget/ActionMenuView+IOnMenuItemClickListener.xml
@@ -68,7 +68,8 @@
           <c>MenuItem</c> that was clicked</param>
         <summary>This method will be invoked when a menu item is clicked if the item itself did
             not already handle the event.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if the event was handled, &lt;code&gt;false&lt;/code&gt; otherwise.</returns>
+        <returns>
+          <c>true</c> if the event was handled, <c>false</c> otherwise.</returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Widget/AutoCompleteTextView.xml b/docs/Mono.Android/en/Android.Widget/AutoCompleteTextView.xml
index 275cc0a6a6..d2756cc6c3 100644
--- a/docs/Mono.Android/en/Android.Widget/AutoCompleteTextView.xml
+++ b/docs/Mono.Android/en/Android.Widget/AutoCompleteTextView.xml
@@ -877,7 +877,7 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Returns &lt;code&gt;true&lt;/code&gt; if the amount of text in the field meets
+        <summary>Returns <c>true</c> if the amount of text in the field meets
             or exceeds the <c>#getThreshold</c> requirement.</summary>
         <returns>To be added.</returns>
         <remarks>
@@ -916,7 +916,7 @@
       </ReturnValue>
       <Docs>
         <summary>Returns the Filter obtained from <c>Filterable#getFilter</c>,
-            or &lt;code&gt;null&lt;/code&gt; if <c>#setAdapter</c> was not called with
+            or <c>null</c> if <c>#setAdapter</c> was not called with
             a Filterable.</summary>
         <value>To be added.</value>
         <remarks>
@@ -1953,7 +1953,7 @@
       </Parameters>
       <Docs>
         <param name="text">To be added.</param>
-        <param name="filter">If &lt;code&gt;false&lt;/code&gt;, no filtering will be performed
+        <param name="filter">If <c>false</c>, no filtering will be performed
                    as a result of this call.</param>
         <summary>Like <c>#setText(CharSequence)</c>, except that it can disable filtering.</summary>
         <remarks>
@@ -1990,7 +1990,7 @@
       </Parameters>
       <Docs>
         <param name="text">To be added.</param>
-        <param name="filter">If &lt;code&gt;false&lt;/code&gt;, no filtering will be performed
+        <param name="filter">If <c>false</c>, no filtering will be performed
                    as a result of this call.</param>
         <summary>Like <c>#setText(CharSequence)</c>, except that it can disable filtering.</summary>
         <remarks>
diff --git a/docs/Mono.Android/en/Android.Widget/EdgeEffect.xml b/docs/Mono.Android/en/Android.Widget/EdgeEffect.xml
index eb9641cdde..9f9f0b01a2 100644
--- a/docs/Mono.Android/en/Android.Widget/EdgeEffect.xml
+++ b/docs/Mono.Android/en/Android.Widget/EdgeEffect.xml
@@ -621,8 +621,8 @@
                                 initiating the pull. In the case of touch this is the finger position.
                                 Values may be from 0-1.</param>
         <summary>A view should call this when content is pulled away from an edge by the user.</summary>
-        <returns>The amount of &lt;code&gt;deltaDistance&lt;/code&gt; that was consumed, a number between
-            0 and &lt;code&gt;deltaDistance&lt;/code&gt;.</returns>
+        <returns>The amount of <c>deltaDistance</c> that was consumed, a number between
+            0 and <c>deltaDistance</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Widget/ListView+FixedViewInfo.xml b/docs/Mono.Android/en/Android.Widget/ListView+FixedViewInfo.xml
index 0d593b22fe..284159892a 100644
--- a/docs/Mono.Android/en/Android.Widget/ListView+FixedViewInfo.xml
+++ b/docs/Mono.Android/en/Android.Widget/ListView+FixedViewInfo.xml
@@ -142,7 +142,8 @@
         <ReturnType>System.Boolean</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>&lt;code&gt;true&lt;/code&gt; if the fixed view should be selectable in the list</summary>
+        <summary>
+          <c>true</c> if the fixed view should be selectable in the list</summary>
         <value>To be added.</value>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Widget/MultiAutoCompleteTextView+ITokenizer.xml b/docs/Mono.Android/en/Android.Widget/MultiAutoCompleteTextView+ITokenizer.xml
index 7f784d2269..3270f111d0 100644
--- a/docs/Mono.Android/en/Android.Widget/MultiAutoCompleteTextView+ITokenizer.xml
+++ b/docs/Mono.Android/en/Android.Widget/MultiAutoCompleteTextView+ITokenizer.xml
@@ -63,7 +63,7 @@
         <param name="text">To be added.</param>
         <param name="cursor">To be added.</param>
         <summary>Returns the end of the token (minus trailing punctuation)
-            that begins at offset &lt;code&gt;cursor&lt;/code&gt; within &lt;code&gt;text&lt;/code&gt;.</summary>
+            that begins at offset <c>cursor</c> within <c>text</c>.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
@@ -107,7 +107,7 @@
         <param name="text">To be added.</param>
         <param name="cursor">To be added.</param>
         <summary>Returns the start of the token that ends at offset
-            &lt;code&gt;cursor&lt;/code&gt; within &lt;code&gt;text&lt;/code&gt;.</summary>
+            <c>cursor</c> within <c>text</c>.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
@@ -148,7 +148,7 @@
       </Parameters>
       <Docs>
         <param name="text">To be added.</param>
-        <summary>Returns &lt;code&gt;text&lt;/code&gt;, modified, if necessary, to ensure that
+        <summary>Returns <c>text</c>, modified, if necessary, to ensure that
             it ends with a token terminator (for example a space or comma).</summary>
         <returns>To be added.</returns>
         <remarks>
diff --git a/docs/Mono.Android/en/Android.Widget/RemoteViews+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Widget/RemoteViews+InterfaceConsts.xml
index 81811fd7e5..ef61b509b3 100644
--- a/docs/Mono.Android/en/Android.Widget/RemoteViews+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Widget/RemoteViews+InterfaceConsts.xml
@@ -82,9 +82,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Widget/RemoteViews+RemoteCollectionItems+InterfaceConsts.xml b/docs/Mono.Android/en/Android.Widget/RemoteViews+RemoteCollectionItems+InterfaceConsts.xml
index 14fae15a7c..21f4e5854e 100644
--- a/docs/Mono.Android/en/Android.Widget/RemoteViews+RemoteCollectionItems+InterfaceConsts.xml
+++ b/docs/Mono.Android/en/Android.Widget/RemoteViews+RemoteCollectionItems+InterfaceConsts.xml
@@ -80,9 +80,9 @@
       <Docs>
         <summary>Flag for use with <c>#writeToParcel</c>: the object being written
             is a return value, that is the result of a function such as
-            "&lt;code&gt;Parcelable someFunction()&lt;/code&gt;",
-            "&lt;code&gt;void someFunction(out Parcelable)&lt;/code&gt;", or
-            "&lt;code&gt;void someFunction(inout Parcelable)&lt;/code&gt;".</summary>
+            "<c>Parcelable someFunction()</c>",
+            "<c>void someFunction(out Parcelable)</c>", or
+            "<c>void someFunction(inout Parcelable)</c>".</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Widget/TextClock.xml b/docs/Mono.Android/en/Android.Widget/TextClock.xml
index 31b43e496c..fb387bcb28 100644
--- a/docs/Mono.Android/en/Android.Widget/TextClock.xml
+++ b/docs/Mono.Android/en/Android.Widget/TextClock.xml
@@ -18,7 +18,8 @@
     </Attribute>
   </Attributes>
   <Docs since="17">
-    <summary>&lt;code&gt;TextClock&lt;/code&gt; can display the current date and/or time as
+    <summary>
+      <c>TextClock</c> can display the current date and/or time as
             a formatted string.</summary>
     <remarks>
       <para>
diff --git a/docs/Mono.Android/en/Android.Widget/TextView.xml b/docs/Mono.Android/en/Android.Widget/TextView.xml
index d2fe3921c4..8476ed4e6b 100644
--- a/docs/Mono.Android/en/Android.Widget/TextView.xml
+++ b/docs/Mono.Android/en/Android.Widget/TextView.xml
@@ -1720,7 +1720,7 @@
       </ReturnValue>
       <Docs>
         <summary>Returns the error message that was set to be displayed with
-            <c>#setError</c>, or &lt;code&gt;null&lt;/code&gt; if no error was set
+            <c>#setError</c>, or <c>null</c> if no error was set
             or if it the error was cleared by the widget after user input. -or- Sets the right-hand compound drawable of the TextView to the "error"
             icon and sets an error message that will be displayed in a popup when
             the TextView has focus.</summary>
@@ -6239,7 +6239,7 @@
       </Parameters>
       <Docs>
         <param name="pixels">the exact height of the TextView in terms of pixels</param>
-        <summary>Sets the height of the TextView to be exactly &lt;code&gt;pixels&lt;/code&gt; tall.</summary>
+        <summary>Sets the height of the TextView to be exactly <c>pixels</c> tall.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Widget/Toolbar+IOnMenuItemClickListener.xml b/docs/Mono.Android/en/Android.Widget/Toolbar+IOnMenuItemClickListener.xml
index fa5333f3ea..71660e1994 100644
--- a/docs/Mono.Android/en/Android.Widget/Toolbar+IOnMenuItemClickListener.xml
+++ b/docs/Mono.Android/en/Android.Widget/Toolbar+IOnMenuItemClickListener.xml
@@ -68,7 +68,8 @@
           <c>MenuItem</c> that was clicked</param>
         <summary>This method will be invoked when a menu item is clicked if the item itself did
             not already handle the event.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if the event was handled, &lt;code&gt;false&lt;/code&gt; otherwise.</returns>
+        <returns>
+          <c>true</c> if the event was handled, <c>false</c> otherwise.</returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Android.Widget/Toolbar.xml b/docs/Mono.Android/en/Android.Widget/Toolbar.xml
index 10048b94a2..d6dfc87966 100644
--- a/docs/Mono.Android/en/Android.Widget/Toolbar.xml
+++ b/docs/Mono.Android/en/Android.Widget/Toolbar.xml
@@ -260,7 +260,7 @@
         <ReturnType>Java.Lang.ICharSequence</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="description">Content description to set, or &lt;code&gt;null&lt;/code&gt; to
+        <param name="description">Content description to set, or <c>null</c> to
                                clear the content description</param>
         <summary>Retrieve the currently configured content description for the collapse button view. -or- Set a content description for the collapse button if one is present.</summary>
         <value>The collapse button's content description</value>
@@ -1178,7 +1178,7 @@
         <ReturnType>Java.Lang.ICharSequence</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="description">Content description to set, or &lt;code&gt;null&lt;/code&gt; to
+        <param name="description">Content description to set, or <c>null</c> to
                                clear the content description</param>
         <summary>Retrieve the currently configured content description for the navigation button view. -or- Set a content description for the navigation button if one is present.</summary>
         <value>The navigation button's content description</value>
diff --git a/docs/Mono.Android/en/Android.Widget/VideoView.xml b/docs/Mono.Android/en/Android.Widget/VideoView.xml
index f1e593bbf7..d5ff1df4a5 100644
--- a/docs/Mono.Android/en/Android.Widget/VideoView.xml
+++ b/docs/Mono.Android/en/Android.Widget/VideoView.xml
@@ -769,7 +769,7 @@
         <Parameter Name="attributes" Type="Android.Media.AudioAttributes" />
       </Parameters>
       <Docs>
-        <param name="attributes">non-null &lt;code&gt;AudioAttributes&lt;/code&gt;.</param>
+        <param name="attributes">non-null <c>AudioAttributes</c>.</param>
         <summary>Sets the <c>AudioAttributes</c> to be used during the playback of the video.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.Awt.Font/NumericShaper.xml b/docs/Mono.Android/en/Java.Awt.Font/NumericShaper.xml
index 43cadadb18..148161fa3f 100644
--- a/docs/Mono.Android/en/Java.Awt.Font/NumericShaper.xml
+++ b/docs/Mono.Android/en/Java.Awt.Font/NumericShaper.xml
@@ -31,7 +31,7 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>The &lt;code&gt;NumericShaper&lt;/code&gt; class is used to convert Latin-1 (European)
+    <summary>The <c>NumericShaper</c> class is used to convert Latin-1 (European)
             digits to other Unicode decimal digits.</summary>
     <remarks>
       <para>
@@ -417,7 +417,7 @@
       <Docs>
         <param name="ranges">the specified Unicode ranges</param>
         <param name="defaultContext">the starting context, such as
-            &lt;code&gt;NumericShaper.EUROPEAN&lt;/code&gt;</param>
+            <c>NumericShaper.EUROPEAN</c></param>
         <summary>Returns a contextual shaper for the provided unicode range(s).</summary>
         <returns>a shaper for the specified Unicode ranges.</returns>
         <remarks>
@@ -585,10 +585,11 @@
         <ReturnType>System.Boolean</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Returns a &lt;code&gt;boolean&lt;/code&gt; indicating whether or not
+        <summary>Returns a <c>boolean</c> indicating whether or not
             this shaper shapes contextually.</summary>
-        <value>&lt;code&gt;true&lt;/code&gt; if this shaper is contextual;
-                    &lt;code&gt;false&lt;/code&gt; otherwise.</value>
+        <value>
+          <c>true</c> if this shaper is contextual;
+                    <c>false</c> otherwise.</value>
         <remarks>
           <para>
             <format type="text/html">
@@ -945,7 +946,7 @@
         <ReturnType>Java.Awt.Font.Ranges</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Returns an &lt;code&gt;int&lt;/code&gt; that ORs together the values for
+        <summary>Returns an <c>int</c> that ORs together the values for
             all the ranges that will be shaped.</summary>
         <value>the values for all the ranges to be shaped.</value>
         <remarks>
@@ -1026,9 +1027,9 @@
       </Parameters>
       <Docs>
         <param name="text">an array of characters to convert</param>
-        <param name="start">the index into &lt;code&gt;text&lt;/code&gt; to start
+        <param name="start">the index into <c>text</c> to start
                    converting</param>
-        <param name="count">the number of characters in &lt;code&gt;text&lt;/code&gt;
+        <param name="count">the number of characters in <c>text</c>
                    to convert</param>
         <summary>Converts the digits in the text that occur between start and
             start + count.</summary>
@@ -1122,12 +1123,12 @@
       </Parameters>
       <Docs>
         <param name="text">an array of characters</param>
-        <param name="start">the index into &lt;code&gt;text&lt;/code&gt; to start
+        <param name="start">the index into <c>text</c> to start
                    converting</param>
-        <param name="count">the number of characters in &lt;code&gt;text&lt;/code&gt;
+        <param name="count">the number of characters in <c>text</c>
                    to convert</param>
         <param name="context">the context to which to convert the
-                   characters, such as &lt;code&gt;NumericShaper.EUROPEAN&lt;/code&gt;</param>
+                   characters, such as <c>NumericShaper.EUROPEAN</c></param>
         <summary>Converts the digits in the text that occur between start and
             start + count, using the provided context.</summary>
         <remarks>
diff --git a/docs/Mono.Android/en/Java.Awt.Font/TextAttribute.xml b/docs/Mono.Android/en/Java.Awt.Font/TextAttribute.xml
index 2820bd37e2..3dde5075b0 100644
--- a/docs/Mono.Android/en/Java.Awt.Font/TextAttribute.xml
+++ b/docs/Mono.Android/en/Java.Awt.Font/TextAttribute.xml
@@ -18,7 +18,7 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>The &lt;code&gt;TextAttribute&lt;/code&gt; class defines attribute keys and
+    <summary>The <c>TextAttribute</c> class defines attribute keys and
             attribute values used for text rendering.</summary>
     <remarks>
       <para>
@@ -1126,7 +1126,7 @@
       </ReturnValue>
       <Docs>
         <summary>Attribute key for swapping foreground and background
-            &lt;code&gt;Paints&lt;/code&gt;.</summary>
+            <c>Paints</c>.</summary>
         <value>To be added.</value>
         <remarks>
           <para>
@@ -1743,7 +1743,7 @@
         <ReturnType>Java.Lang.Float</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>A moderately lighter weight than &lt;code&gt;WEIGHT_BOLD&lt;/code&gt;.</summary>
+        <summary>A moderately lighter weight than <c>WEIGHT_BOLD</c>.</summary>
         <value>To be added.</value>
         <remarks>
           <para>
@@ -1780,8 +1780,8 @@
         <ReturnType>Java.Lang.Float</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>An intermediate weight between &lt;code&gt;WEIGHT_LIGHT&lt;/code&gt; and
-            &lt;code&gt;WEIGHT_STANDARD&lt;/code&gt;.</summary>
+        <summary>An intermediate weight between <c>WEIGHT_LIGHT</c> and
+            <c>WEIGHT_STANDARD</c>.</summary>
         <value>To be added.</value>
         <remarks>
           <para>
@@ -1892,7 +1892,7 @@
         <ReturnType>Java.Lang.Float</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>A moderately heavier weight than &lt;code&gt;WEIGHT_BOLD&lt;/code&gt;.</summary>
+        <summary>A moderately heavier weight than <c>WEIGHT_BOLD</c>.</summary>
         <value>To be added.</value>
         <remarks>
           <para>
@@ -1966,8 +1966,8 @@
         <ReturnType>Java.Lang.Float</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>An intermediate weight between &lt;code&gt;WEIGHT_REGULAR&lt;/code&gt; and
-            &lt;code&gt;WEIGHT_BOLD&lt;/code&gt;.</summary>
+        <summary>An intermediate weight between <c>WEIGHT_REGULAR</c> and
+            <c>WEIGHT_BOLD</c>.</summary>
         <value>To be added.</value>
         <remarks>
           <para>
@@ -2041,7 +2041,7 @@
         <ReturnType>Java.Lang.Float</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>A moderately heavier weight than &lt;code&gt;WEIGHT_REGULAR&lt;/code&gt;.</summary>
+        <summary>A moderately heavier weight than <c>WEIGHT_REGULAR</c>.</summary>
         <value>To be added.</value>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.Beans/IndexedPropertyChangeEvent.xml b/docs/Mono.Android/en/Java.Beans/IndexedPropertyChangeEvent.xml
index e806ac3fe4..40a01be001 100644
--- a/docs/Mono.Android/en/Java.Beans/IndexedPropertyChangeEvent.xml
+++ b/docs/Mono.Android/en/Java.Beans/IndexedPropertyChangeEvent.xml
@@ -89,7 +89,7 @@
         <param name="oldValue">The old value of the property.</param>
         <param name="newValue">The new value of the property.</param>
         <param name="index">index of the property element that was changed.</param>
-        <summary>Constructs a new &lt;code&gt;IndexedPropertyChangeEvent&lt;/code&gt; object.</summary>
+        <summary>Constructs a new <c>IndexedPropertyChangeEvent</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.Beans/PropertyChangeSupport.xml b/docs/Mono.Android/en/Java.Beans/PropertyChangeSupport.xml
index f246f48932..a360d3ad18 100644
--- a/docs/Mono.Android/en/Java.Beans/PropertyChangeSupport.xml
+++ b/docs/Mono.Android/en/Java.Beans/PropertyChangeSupport.xml
@@ -69,7 +69,7 @@
       </Parameters>
       <Docs>
         <param name="sourceBean">The bean to be given as the source for any events.</param>
-        <summary>Constructs a &lt;code&gt;PropertyChangeSupport&lt;/code&gt; object.</summary>
+        <summary>Constructs a <c>PropertyChangeSupport</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -538,7 +538,7 @@
       <Docs>
         <summary>Returns an array of all the listeners that were added to the
             PropertyChangeSupport object with addPropertyChangeListener().</summary>
-        <returns>all of the &lt;code&gt;PropertyChangeListeners&lt;/code&gt; added or an
+        <returns>all of the <c>PropertyChangeListeners</c> added or an
                     empty array if no listeners have been added</returns>
         <remarks>
           <para>
@@ -581,9 +581,9 @@
         <param name="propertyName">The name of the property being listened to</param>
         <summary>Returns an array of all the listeners which have been associated
             with the named property.</summary>
-        <returns>all of the &lt;code&gt;PropertyChangeListeners&lt;/code&gt; associated with
+        <returns>all of the <c>PropertyChangeListeners</c> associated with
                     the named property.  If no such listeners have been added,
-                    or if &lt;code&gt;propertyName&lt;/code&gt; is null, an empty array is
+                    or if <c>propertyName</c> is null, an empty array is
                     returned.</returns>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/BufferedInputStream.xml b/docs/Mono.Android/en/Java.IO/BufferedInputStream.xml
index 489687a3e9..25d473ba9d 100644
--- a/docs/Mono.Android/en/Java.IO/BufferedInputStream.xml
+++ b/docs/Mono.Android/en/Java.IO/BufferedInputStream.xml
@@ -18,10 +18,10 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>A &lt;code&gt;BufferedInputStream&lt;/code&gt; adds
+    <summary>A <c>BufferedInputStream</c> adds
             functionality to another input stream-namely,
             the ability to buffer the input and to
-            support the &lt;code&gt;mark&lt;/code&gt; and &lt;code&gt;reset&lt;/code&gt;
+            support the <c>mark</c> and <c>reset</c>
             methods.</summary>
     <remarks>
       <para>
@@ -59,9 +59,9 @@
       </Parameters>
       <Docs>
         <param name="in">the underlying input stream.</param>
-        <summary>Creates a &lt;code&gt;BufferedInputStream&lt;/code&gt;
+        <summary>Creates a <c>BufferedInputStream</c>
             and saves its  argument, the input stream
-            &lt;code&gt;in&lt;/code&gt;, for later use.</summary>
+            <c>in</c>, for later use.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -123,10 +123,10 @@
       <Docs>
         <param name="in">the underlying input stream.</param>
         <param name="size">the buffer size.</param>
-        <summary>Creates a &lt;code&gt;BufferedInputStream&lt;/code&gt;
+        <summary>Creates a <c>BufferedInputStream</c>
             with the specified buffer size,
             and saves its  argument, the input stream
-            &lt;code&gt;in&lt;/code&gt;, for later use.</summary>
+            <c>in</c>, for later use.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -271,8 +271,8 @@
       </ReturnValue>
       <Docs>
         <summary>The maximum read ahead allowed after a call to the
-            &lt;code&gt;mark&lt;/code&gt; method before subsequent calls to the
-            &lt;code&gt;reset&lt;/code&gt; method fail.</summary>
+            <c>mark</c> method before subsequent calls to the
+            <c>reset</c> method fail.</summary>
         <value>To be added.</value>
         <remarks>
           <para>
@@ -309,8 +309,8 @@
         <ReturnType>System.Int32</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>The value of the &lt;code&gt;pos&lt;/code&gt; field at the time the last
-            &lt;code&gt;mark&lt;/code&gt; method was called.</summary>
+        <summary>The value of the <c>pos</c> field at the time the last
+            <c>mark</c> method was called.</summary>
         <value>To be added.</value>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/ByteArrayInputStream.xml b/docs/Mono.Android/en/Java.IO/ByteArrayInputStream.xml
index 4149dc14cd..38ad23abac 100644
--- a/docs/Mono.Android/en/Java.IO/ByteArrayInputStream.xml
+++ b/docs/Mono.Android/en/Java.IO/ByteArrayInputStream.xml
@@ -18,7 +18,7 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>A &lt;code&gt;ByteArrayInputStream&lt;/code&gt; contains
+    <summary>A <c>ByteArrayInputStream</c> contains
             an internal buffer that contains bytes that
             may be read from the stream.</summary>
     <remarks>
@@ -57,8 +57,8 @@
       </Parameters>
       <Docs>
         <param name="buf">the input buffer.</param>
-        <summary>Creates a &lt;code&gt;ByteArrayInputStream&lt;/code&gt;
-            so that it  uses &lt;code&gt;buf&lt;/code&gt; as its
+        <summary>Creates a <c>ByteArrayInputStream</c>
+            so that it  uses <c>buf</c> as its
             buffer array.</summary>
         <remarks>
           <para>
@@ -123,8 +123,8 @@
         <param name="buf">the input buffer.</param>
         <param name="offset">the offset in the buffer of the first byte to read.</param>
         <param name="length">the maximum number of bytes to read from the buffer.</param>
-        <summary>Creates &lt;code&gt;ByteArrayInputStream&lt;/code&gt;
-            that uses &lt;code&gt;buf&lt;/code&gt; as its
+        <summary>Creates <c>ByteArrayInputStream</c>
+            that uses <c>buf</c> as its
             buffer array.</summary>
         <remarks>
           <para>
@@ -344,7 +344,7 @@
       <Parameters />
       <Docs>
         <summary>Reads the next byte of data from this input stream.</summary>
-        <returns>the next byte of data, or &lt;code&gt;-1&lt;/code&gt; if the end of the
+        <returns>the next byte of data, or <c>-1</c> if the end of the
                      stream has been reached.</returns>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/ByteArrayOutputStream.xml b/docs/Mono.Android/en/Java.IO/ByteArrayOutputStream.xml
index e817ccb817..9dc7ef8c32 100644
--- a/docs/Mono.Android/en/Java.IO/ByteArrayOutputStream.xml
+++ b/docs/Mono.Android/en/Java.IO/ByteArrayOutputStream.xml
@@ -256,7 +256,7 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Resets the &lt;code&gt;count&lt;/code&gt; field of this byte array output
+        <summary>Resets the <c>count</c> field of this byte array output
             stream to zero, so that all currently accumulated output in the
             output stream is discarded.</summary>
         <remarks>
@@ -296,7 +296,7 @@
       <Parameters />
       <Docs>
         <summary>Returns the current size of the buffer.</summary>
-        <returns>the value of the &lt;code&gt;count&lt;/code&gt; field, which is the number
+        <returns>the value of the <c>count</c> field, which is the number
                      of valid bytes in this output stream.</returns>
         <remarks>
           <para>
@@ -569,7 +569,7 @@
         <param name="out">the output stream to which to write the data.</param>
         <summary>Writes the complete contents of this byte array output stream to
             the specified output stream argument, as if by calling the output
-            stream's write method using &lt;code&gt;out.</summary>
+            stream's write method using <c>out.write(buf, 0, count)</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.IO/DataInputStream.xml b/docs/Mono.Android/en/Java.IO/DataInputStream.xml
index c901b63255..8e74166f4f 100644
--- a/docs/Mono.Android/en/Java.IO/DataInputStream.xml
+++ b/docs/Mono.Android/en/Java.IO/DataInputStream.xml
@@ -171,9 +171,9 @@
       <Docs>
         <param name="b">the buffer into which the data is read.</param>
         <summary>Reads some number of bytes from the contained input stream and
-            stores them into the buffer array &lt;code&gt;b&lt;/code&gt;.</summary>
+            stores them into the buffer array <c>b</c>.</summary>
         <returns>the total number of bytes read into the buffer, or
-                        &lt;code&gt;-1&lt;/code&gt; if there is no more data because the end
+                        <c>-1</c> if there is no more data because the end
                         of the stream has been reached.</returns>
         <remarks>
           <para>
@@ -217,12 +217,12 @@
       </Parameters>
       <Docs>
         <param name="b">the buffer into which the data is read.</param>
-        <param name="off">the start offset in the destination array &lt;code&gt;b&lt;/code&gt;</param>
+        <param name="off">the start offset in the destination array <c>b</c></param>
         <param name="len">the maximum number of bytes read.</param>
-        <summary>Reads up to &lt;code&gt;len&lt;/code&gt; bytes of data from the contained
+        <summary>Reads up to <c>len</c> bytes of data from the contained
             input stream into an array of bytes.</summary>
         <returns>the total number of bytes read into the buffer, or
-                        &lt;code&gt;-1&lt;/code&gt; if there is no more data because the end
+                        <c>-1</c> if there is no more data because the end
                         of the stream has been reached.</returns>
         <remarks>
           <para>
@@ -264,9 +264,9 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>See the general contract of the &lt;code&gt;readBoolean&lt;/code&gt;
-            method of &lt;code&gt;DataInput&lt;/code&gt;.</summary>
-        <returns>the &lt;code&gt;boolean&lt;/code&gt; value read.</returns>
+        <summary>See the general contract of the <c>readBoolean</c>
+            method of <c>DataInput</c>.</summary>
+        <returns>the <c>boolean</c> value read.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -307,10 +307,10 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>See the general contract of the &lt;code&gt;readByte&lt;/code&gt;
-            method of &lt;code&gt;DataInput&lt;/code&gt;.</summary>
+        <summary>See the general contract of the <c>readByte</c>
+            method of <c>DataInput</c>.</summary>
         <returns>the next byte of this input stream as a signed 8-bit
-                        &lt;code&gt;byte&lt;/code&gt;.</returns>
+                        <c>byte</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -351,10 +351,10 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>See the general contract of the &lt;code&gt;readChar&lt;/code&gt;
-            method of &lt;code&gt;DataInput&lt;/code&gt;.</summary>
+        <summary>See the general contract of the <c>readChar</c>
+            method of <c>DataInput</c>.</summary>
         <returns>the next two bytes of this input stream, interpreted as a
-                        &lt;code&gt;char&lt;/code&gt;.</returns>
+                        <c>char</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -395,10 +395,10 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>See the general contract of the &lt;code&gt;readDouble&lt;/code&gt;
-            method of &lt;code&gt;DataInput&lt;/code&gt;.</summary>
+        <summary>See the general contract of the <c>readDouble</c>
+            method of <c>DataInput</c>.</summary>
         <returns>the next eight bytes of this input stream, interpreted as a
-                        &lt;code&gt;double&lt;/code&gt;.</returns>
+                        <c>double</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -439,10 +439,10 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>See the general contract of the &lt;code&gt;readFloat&lt;/code&gt;
-            method of &lt;code&gt;DataInput&lt;/code&gt;.</summary>
+        <summary>See the general contract of the <c>readFloat</c>
+            method of <c>DataInput</c>.</summary>
         <returns>the next four bytes of this input stream, interpreted as a
-                        &lt;code&gt;float&lt;/code&gt;.</returns>
+                        <c>float</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -486,8 +486,8 @@
       </Parameters>
       <Docs>
         <param name="b">the buffer into which the data is read.</param>
-        <summary>See the general contract of the &lt;code&gt;readFully&lt;/code&gt;
-            method of &lt;code&gt;DataInput&lt;/code&gt;.</summary>
+        <summary>See the general contract of the <c>readFully</c>
+            method of <c>DataInput</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -535,8 +535,8 @@
         <param name="b">the buffer into which the data is read.</param>
         <param name="off">the start offset of the data.</param>
         <param name="len">the number of bytes to read.</param>
-        <summary>See the general contract of the &lt;code&gt;readFully&lt;/code&gt;
-            method of &lt;code&gt;DataInput&lt;/code&gt;.</summary>
+        <summary>See the general contract of the <c>readFully</c>
+            method of <c>DataInput</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -577,10 +577,10 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>See the general contract of the &lt;code&gt;readInt&lt;/code&gt;
-            method of &lt;code&gt;DataInput&lt;/code&gt;.</summary>
+        <summary>See the general contract of the <c>readInt</c>
+            method of <c>DataInput</c>.</summary>
         <returns>the next four bytes of this input stream, interpreted as an
-                        &lt;code&gt;int&lt;/code&gt;.</returns>
+                        <c>int</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -625,8 +625,8 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>See the general contract of the &lt;code&gt;readLine&lt;/code&gt;
-            method of &lt;code&gt;DataInput&lt;/code&gt;.</summary>
+        <summary>See the general contract of the <c>readLine</c>
+            method of <c>DataInput</c>.</summary>
         <returns>the next line of text from this input stream.</returns>
         <remarks>
           <para>
@@ -668,10 +668,10 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>See the general contract of the &lt;code&gt;readLong&lt;/code&gt;
-            method of &lt;code&gt;DataInput&lt;/code&gt;.</summary>
+        <summary>See the general contract of the <c>readLong</c>
+            method of <c>DataInput</c>.</summary>
         <returns>the next eight bytes of this input stream, interpreted as a
-                        &lt;code&gt;long&lt;/code&gt;.</returns>
+                        <c>long</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -712,8 +712,8 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>See the general contract of the &lt;code&gt;readShort&lt;/code&gt;
-            method of &lt;code&gt;DataInput&lt;/code&gt;.</summary>
+        <summary>See the general contract of the <c>readShort</c>
+            method of <c>DataInput</c>.</summary>
         <returns>the next two bytes of this input stream, interpreted as a
                         signed 16-bit number.</returns>
         <remarks>
@@ -756,8 +756,8 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>See the general contract of the &lt;code&gt;readUnsignedByte&lt;/code&gt;
-            method of &lt;code&gt;DataInput&lt;/code&gt;.</summary>
+        <summary>See the general contract of the <c>readUnsignedByte</c>
+            method of <c>DataInput</c>.</summary>
         <returns>the next byte of this input stream, interpreted as an
                         unsigned 8-bit number.</returns>
         <remarks>
@@ -800,8 +800,8 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>See the general contract of the &lt;code&gt;readUnsignedShort&lt;/code&gt;
-            method of &lt;code&gt;DataInput&lt;/code&gt;.</summary>
+        <summary>See the general contract of the <c>readUnsignedShort</c>
+            method of <c>DataInput</c>.</summary>
         <returns>the next two bytes of this input stream, interpreted as an
                         unsigned 16-bit integer.</returns>
         <remarks>
@@ -844,8 +844,8 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>See the general contract of the &lt;code&gt;readUTF&lt;/code&gt;
-            method of &lt;code&gt;DataInput&lt;/code&gt;.</summary>
+        <summary>See the general contract of the <c>readUTF</c>
+            method of <c>DataInput</c>.</summary>
         <returns>a Unicode string.</returns>
         <remarks>
           <para>
@@ -888,7 +888,7 @@
       <Docs>
         <param name="in">a data input stream.</param>
         <summary>Reads from the
-            stream &lt;code&gt;in&lt;/code&gt; a representation
+            stream <c>in</c> a representation
             of a Unicode  character string encoded in
             "DataInput.</summary>
         <returns>a Unicode string.</returns>
@@ -935,8 +935,8 @@
       </Parameters>
       <Docs>
         <param name="n">the number of bytes to be skipped.</param>
-        <summary>See the general contract of the &lt;code&gt;skipBytes&lt;/code&gt;
-            method of &lt;code&gt;DataInput&lt;/code&gt;.</summary>
+        <summary>See the general contract of the <c>skipBytes</c>
+            method of <c>DataInput</c>.</summary>
         <returns>the actual number of bytes skipped.</returns>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/DataOutputStream.xml b/docs/Mono.Android/en/Java.IO/DataOutputStream.xml
index 0842e8406c..b3df492730 100644
--- a/docs/Mono.Android/en/Java.IO/DataOutputStream.xml
+++ b/docs/Mono.Android/en/Java.IO/DataOutputStream.xml
@@ -165,9 +165,9 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Returns the current value of the counter &lt;code&gt;written&lt;/code&gt;,
+        <summary>Returns the current value of the counter <c>written</c>,
             the number of bytes written to this data output stream so far.</summary>
-        <returns>the value of the &lt;code&gt;written&lt;/code&gt; field.</returns>
+        <returns>the value of the <c>written</c> field.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -271,8 +271,8 @@
         <Parameter Name="v" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="v">a &lt;code&gt;boolean&lt;/code&gt; value to be written.</param>
-        <summary>Writes a &lt;code&gt;boolean&lt;/code&gt; to the underlying output stream as
+        <param name="v">a <c>boolean</c> value to be written.</param>
+        <summary>Writes a <c>boolean</c> to the underlying output stream as
             a 1-byte value.</summary>
         <remarks>
           <para>
@@ -317,8 +317,8 @@
         <Parameter Name="v" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="v">a &lt;code&gt;byte&lt;/code&gt; value to be written.</param>
-        <summary>Writes out a &lt;code&gt;byte&lt;/code&gt; to the underlying output stream as
+        <param name="v">a <c>byte</c> value to be written.</param>
+        <summary>Writes out a <c>byte</c> to the underlying output stream as
             a 1-byte value.</summary>
         <remarks>
           <para>
@@ -409,8 +409,8 @@
         <Parameter Name="v" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="v">a &lt;code&gt;char&lt;/code&gt; value to be written.</param>
-        <summary>Writes a &lt;code&gt;char&lt;/code&gt; to the underlying output stream as a
+        <param name="v">a <c>char</c> value to be written.</param>
+        <summary>Writes a <c>char</c> to the underlying output stream as a
             2-byte value, high byte first.</summary>
         <remarks>
           <para>
@@ -454,7 +454,7 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">a &lt;code&gt;String&lt;/code&gt; value to be written.</param>
+        <param name="s">a <c>String</c> value to be written.</param>
         <summary>Writes a string to the underlying output stream as a sequence of
             characters.</summary>
         <remarks>
@@ -499,10 +499,10 @@
         <Parameter Name="v" Type="System.Double" />
       </Parameters>
       <Docs>
-        <param name="v">a &lt;code&gt;double&lt;/code&gt; value to be written.</param>
-        <summary>Converts the double argument to a &lt;code&gt;long&lt;/code&gt; using the
-            &lt;code&gt;doubleToLongBits&lt;/code&gt; method in class &lt;code&gt;Double&lt;/code&gt;,
-            and then writes that &lt;code&gt;long&lt;/code&gt; value to the underlying
+        <param name="v">a <c>double</c> value to be written.</param>
+        <summary>Converts the double argument to a <c>long</c> using the
+            <c>doubleToLongBits</c> method in class <c>Double</c>,
+            and then writes that <c>long</c> value to the underlying
             output stream as an 8-byte quantity, high byte first.</summary>
         <remarks>
           <para>
@@ -546,10 +546,10 @@
         <Parameter Name="v" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="v">a &lt;code&gt;float&lt;/code&gt; value to be written.</param>
-        <summary>Converts the float argument to an &lt;code&gt;int&lt;/code&gt; using the
-            &lt;code&gt;floatToIntBits&lt;/code&gt; method in class &lt;code&gt;Float&lt;/code&gt;,
-            and then writes that &lt;code&gt;int&lt;/code&gt; value to the underlying
+        <param name="v">a <c>float</c> value to be written.</param>
+        <summary>Converts the float argument to an <c>int</c> using the
+            <c>floatToIntBits</c> method in class <c>Float</c>,
+            and then writes that <c>int</c> value to the underlying
             output stream as a 4-byte quantity, high byte first.</summary>
         <remarks>
           <para>
@@ -593,8 +593,8 @@
         <Parameter Name="v" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="v">an &lt;code&gt;int&lt;/code&gt; to be written.</param>
-        <summary>Writes an &lt;code&gt;int&lt;/code&gt; to the underlying output stream as four
+        <param name="v">an <c>int</c> to be written.</param>
+        <summary>Writes an <c>int</c> to the underlying output stream as four
             bytes, high byte first.</summary>
         <remarks>
           <para>
@@ -638,8 +638,8 @@
         <Parameter Name="v" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="v">a &lt;code&gt;long&lt;/code&gt; to be written.</param>
-        <summary>Writes a &lt;code&gt;long&lt;/code&gt; to the underlying output stream as eight
+        <param name="v">a <c>long</c> to be written.</param>
+        <summary>Writes a <c>long</c> to the underlying output stream as eight
             bytes, high byte first.</summary>
         <remarks>
           <para>
@@ -683,8 +683,8 @@
         <Parameter Name="v" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="v">a &lt;code&gt;short&lt;/code&gt; to be written.</param>
-        <summary>Writes a &lt;code&gt;short&lt;/code&gt; to the underlying output stream as two
+        <param name="v">a <c>short</c> to be written.</param>
+        <summary>Writes a <c>short</c> to the underlying output stream as two
             bytes, high byte first.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/EOFException.xml b/docs/Mono.Android/en/Java.IO/EOFException.xml
index fb09ffb1d1..dd70b34195 100644
--- a/docs/Mono.Android/en/Java.IO/EOFException.xml
+++ b/docs/Mono.Android/en/Java.IO/EOFException.xml
@@ -52,7 +52,7 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <summary>Constructs an &lt;code&gt;EOFException&lt;/code&gt; with &lt;code&gt;null&lt;/code&gt;
+        <summary>Constructs an <c>EOFException</c> with <c>null</c>
             as its error detail message.</summary>
         <remarks>
           <para>
@@ -90,7 +90,7 @@
       </Parameters>
       <Docs>
         <param name="s">the detail message.</param>
-        <summary>Constructs an &lt;code&gt;EOFException&lt;/code&gt; with the specified detail
+        <summary>Constructs an <c>EOFException</c> with the specified detail
             message.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/File.xml b/docs/Mono.Android/en/Java.IO/File.xml
index 4dd2ae8a83..0e6004b734 100644
--- a/docs/Mono.Android/en/Java.IO/File.xml
+++ b/docs/Mono.Android/en/Java.IO/File.xml
@@ -115,7 +115,7 @@
       </Parameters>
       <Docs>
         <param name="pathname">A pathname string</param>
-        <summary>Creates a new &lt;code&gt;File&lt;/code&gt; instance by converting the given
+        <summary>Creates a new <c>File</c> instance by converting the given
             pathname string into an abstract pathname.</summary>
         <remarks>
           <para>
@@ -157,7 +157,7 @@
       <Docs>
         <param name="parent">The parent abstract pathname</param>
         <param name="child">The child pathname string</param>
-        <summary>Creates a new &lt;code&gt;File&lt;/code&gt; instance from a parent abstract
+        <summary>Creates a new <c>File</c> instance from a parent abstract
             pathname and a child pathname string.</summary>
         <remarks>
           <para>
@@ -222,7 +222,7 @@
       <Docs>
         <param name="parent">The parent pathname string</param>
         <param name="child">The child pathname string</param>
-        <summary>Creates a new &lt;code&gt;File&lt;/code&gt; instance from a parent pathname string
+        <summary>Creates a new <c>File</c> instance from a parent pathname string
             and a child pathname string.</summary>
         <remarks>
           <para>
@@ -340,7 +340,8 @@
       <Docs>
         <summary>Tests whether the application can execute the file denoted by this
             abstract pathname.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if and only if the abstract pathname exists
+        <returns>
+          <c>true</c> if and only if the abstract pathname exists
                      &lt;em&gt;and&lt;/em&gt; the application is allowed to execute the file</returns>
         <remarks>
           <para>
@@ -460,9 +461,10 @@
       <Docs>
         <summary>Tests whether the application can read the file denoted by this
             abstract pathname.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if and only if the file specified by this
+        <returns>
+          <c>true</c> if and only if the file specified by this
                      abstract pathname exists &lt;em&gt;and&lt;/em&gt; can be read by the
-                     application; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+                     application; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -501,10 +503,11 @@
       <Docs>
         <summary>Tests whether the application can modify the file denoted by this
             abstract pathname.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if and only if the file system actually
+        <returns>
+          <c>true</c> if and only if the file system actually
                      contains a file denoted by this abstract pathname &lt;em&gt;and&lt;/em&gt;
                      the application is allowed to write to the file;
-                     &lt;code&gt;false&lt;/code&gt; otherwise.</returns>
+                     <c>false</c> otherwise.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -590,8 +593,9 @@
       <Docs>
         <summary>Atomically creates a new, empty file named by this abstract pathname if
             and only if a file with this name does not yet exist.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if the named file does not exist and was
-                     successfully created; &lt;code&gt;false&lt;/code&gt; if the named file
+        <returns>
+          <c>true</c> if the named file does not exist and was
+                     successfully created; <c>false</c> if the named file
                      already exists</returns>
         <remarks>
           <para>
@@ -637,8 +641,8 @@
         <param name="prefix">The prefix string to be used in generating the file's
                                name; must be at least three characters long</param>
         <param name="suffix">The suffix string to be used in generating the file's
-                               name; may be &lt;code&gt;null&lt;/code&gt;, in which case the
-                               suffix &lt;code&gt;".tmp"&lt;/code&gt; will be used</param>
+                               name; may be <c>null</c>, in which case the
+                               suffix <c>".tmp"</c> will be used</param>
         <summary>Creates an empty file in the default temporary-file directory, using
             the given prefix and suffix to generate its name.</summary>
         <returns>An abstract pathname denoting a newly-created empty file</returns>
@@ -687,10 +691,10 @@
         <param name="prefix">The prefix string to be used in generating the file's
                                name; must be at least three characters long</param>
         <param name="suffix">The suffix string to be used in generating the file's
-                               name; may be &lt;code&gt;null&lt;/code&gt;, in which case the
-                               suffix &lt;code&gt;".tmp"&lt;/code&gt; will be used</param>
+                               name; may be <c>null</c>, in which case the
+                               suffix <c>".tmp"</c> will be used</param>
         <param name="directory">The directory in which the file is to be created, or
-                               &lt;code&gt;null&lt;/code&gt; if the default temporary-file
+                               <c>null</c> if the default temporary-file
                                directory is to be used</param>
         <summary>Creates a new empty file in the specified directory, using the
             given prefix and suffix strings to generate its name.</summary>
@@ -735,8 +739,9 @@
       <Parameters />
       <Docs>
         <summary>Deletes the file or directory denoted by this abstract pathname.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if and only if the file or directory is
-                     successfully deleted; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if and only if the file or directory is
+                     successfully deleted; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -813,8 +818,9 @@
       <Docs>
         <summary>Tests whether the file or directory denoted by this abstract pathname
             exists.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if and only if the file or directory denoted
-                     by this abstract pathname exists; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if and only if the file or directory denoted
+                     by this abstract pathname exists; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -891,8 +897,9 @@
       </ReturnValue>
       <Docs>
         <summary>Tests whether this abstract pathname is absolute.</summary>
-        <value>&lt;code&gt;true&lt;/code&gt; if this abstract pathname is absolute,
-                     &lt;code&gt;false&lt;/code&gt; otherwise</value>
+        <value>
+          <c>true</c> if this abstract pathname is absolute,
+                     <c>false</c> otherwise</value>
         <remarks>
           <para>
             <format type="text/html">
@@ -931,9 +938,10 @@
       <Docs>
         <summary>Tests whether the file denoted by this abstract pathname is a
             directory.</summary>
-        <value>&lt;code&gt;true&lt;/code&gt; if and only if the file denoted by this
+        <value>
+          <c>true</c> if and only if the file denoted by this
                      abstract pathname exists &lt;em&gt;and&lt;/em&gt; is a directory;
-                     &lt;code&gt;false&lt;/code&gt; otherwise</value>
+                     <c>false</c> otherwise</value>
         <remarks>
           <para>
             <format type="text/html">
@@ -971,9 +979,10 @@
       <Docs>
         <summary>Tests whether the file denoted by this abstract pathname is a normal
             file.</summary>
-        <value>&lt;code&gt;true&lt;/code&gt; if and only if the file denoted by this
+        <value>
+          <c>true</c> if and only if the file denoted by this
                      abstract pathname exists &lt;em&gt;and&lt;/em&gt; is a normal file;
-                     &lt;code&gt;false&lt;/code&gt; otherwise</value>
+                     <c>false</c> otherwise</value>
         <remarks>
           <para>
             <format type="text/html">
@@ -1011,7 +1020,8 @@
       <Docs>
         <summary>Tests whether the file named by this abstract pathname is a hidden
             file.</summary>
-        <value>&lt;code&gt;true&lt;/code&gt; if and only if the file denoted by this
+        <value>
+          <c>true</c> if and only if the file denoted by this
                      abstract pathname is hidden according to the conventions of the
                      underlying platform</value>
         <remarks>
@@ -1114,9 +1124,9 @@
       <Docs>
         <summary>Returns the time that the file denoted by this abstract pathname was
             last modified.</summary>
-        <returns>A &lt;code&gt;long&lt;/code&gt; value representing the time the file was
+        <returns>A <c>long</c> value representing the time the file was
                      last modified, measured in milliseconds since the epoch
-                     (00:00:00 GMT, January 1, 1970), or &lt;code&gt;0L&lt;/code&gt; if the
+                     (00:00:00 GMT, January 1, 1970), or <c>0L</c> if the
                      file does not exist or if an I/O error occurs</returns>
         <remarks>
           <para>
@@ -1156,8 +1166,8 @@
       <Docs>
         <summary>Returns the length of the file denoted by this abstract pathname.</summary>
         <returns>The length, in bytes, of the file denoted by this abstract
-                     pathname, or &lt;code&gt;0L&lt;/code&gt; if the file does not exist.  Some
-                     operating systems may return &lt;code&gt;0L&lt;/code&gt; for pathnames
+                     pathname, or <c>0L</c> if the file does not exist.  Some
+                     operating systems may return <c>0L</c> for pathnames
                      denoting system-dependent entities such as devices or pipes.</returns>
         <remarks>
           <para>
@@ -1603,8 +1613,9 @@
       <Parameters />
       <Docs>
         <summary>Creates the directory named by this abstract pathname.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if and only if the directory was
-                     created; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if and only if the directory was
+                     created; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1643,8 +1654,9 @@
       <Docs>
         <summary>Creates the directory named by this abstract pathname, including any
             necessary but nonexistent parent directories.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if and only if the directory was created,
-                     along with all necessary parent directories; &lt;code&gt;false&lt;/code&gt;
+        <returns>
+          <c>true</c> if and only if the directory was created,
+                     along with all necessary parent directories; <c>false</c>
                      otherwise</returns>
         <remarks>
           <para>
@@ -1722,9 +1734,9 @@
       </ReturnValue>
       <Docs>
         <summary>Returns the pathname string of this abstract pathname's parent, or
-            &lt;code&gt;null&lt;/code&gt; if this pathname does not name a parent directory.</summary>
+            <c>null</c> if this pathname does not name a parent directory.</summary>
         <value>The pathname string of the parent directory named by this
-                     abstract pathname, or &lt;code&gt;null&lt;/code&gt; if this pathname
+                     abstract pathname, or <c>null</c> if this pathname
                      does not name a parent</value>
         <remarks>
           <para>
@@ -1762,10 +1774,10 @@
       </ReturnValue>
       <Docs>
         <summary>Returns the abstract pathname of this abstract pathname's parent,
-            or &lt;code&gt;null&lt;/code&gt; if this pathname does not name a parent
+            or <c>null</c> if this pathname does not name a parent
             directory.</summary>
         <value>The abstract pathname of the parent directory named by this
-                     abstract pathname, or &lt;code&gt;null&lt;/code&gt; if this pathname
+                     abstract pathname, or <c>null</c> if this pathname
                      does not name a parent</value>
         <remarks>
           <para>
@@ -1919,8 +1931,9 @@
       <Docs>
         <param name="dest">The new abstract pathname for the named file</param>
         <summary>Renames the file denoted by this abstract pathname.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if and only if the renaming succeeded;
-                     &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if and only if the renaming succeeded;
+                     <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -2034,14 +2047,15 @@
         <Parameter Name="executable" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="executable">If &lt;code&gt;true&lt;/code&gt;, sets the access permission to allow execute
-                     operations; if &lt;code&gt;false&lt;/code&gt; to disallow execute operations</param>
+        <param name="executable">If <c>true</c>, sets the access permission to allow execute
+                     operations; if <c>false</c> to disallow execute operations</param>
         <summary>A convenience method to set the owner's execute permission for this
             abstract pathname.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if and only if the operation succeeded.  The
+        <returns>
+          <c>true</c> if and only if the operation succeeded.  The
                       operation will fail if the user does not have permission to
                       change the access permissions of this abstract pathname.  If
-                      &lt;code&gt;executable&lt;/code&gt; is &lt;code&gt;false&lt;/code&gt; and the underlying
+                      <c>executable</c> is <c>false</c> and the underlying
                       file system does not implement an execute permission, then the
                       operation will fail.</returns>
         <remarks>
@@ -2084,19 +2098,20 @@
         <Parameter Name="ownerOnly" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="executable">If &lt;code&gt;true&lt;/code&gt;, sets the access permission to allow execute
-                     operations; if &lt;code&gt;false&lt;/code&gt; to disallow execute operations</param>
-        <param name="ownerOnly">If &lt;code&gt;true&lt;/code&gt;, the execute permission applies only to the
+        <param name="executable">If <c>true</c>, sets the access permission to allow execute
+                     operations; if <c>false</c> to disallow execute operations</param>
+        <param name="ownerOnly">If <c>true</c>, the execute permission applies only to the
                      owner's execute permission; otherwise, it applies to everybody.
                      If the underlying file system can not distinguish the owner's
                      execute permission from that of others, then the permission will
                      apply to everybody, regardless of this value.</param>
         <summary>Sets the owner's or everybody's execute permission for this abstract
             pathname.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if and only if the operation succeeded.  The
+        <returns>
+          <c>true</c> if and only if the operation succeeded.  The
                      operation will fail if the user does not have permission to
                      change the access permissions of this abstract pathname.  If
-                     &lt;code&gt;executable&lt;/code&gt; is &lt;code&gt;false&lt;/code&gt; and the underlying
+                     <c>executable</c> is <c>false</c> and the underlying
                      file system does not implement an execute permission, then the
                      operation will fail.</returns>
         <remarks>
@@ -2141,8 +2156,9 @@
                           the epoch (00:00:00 GMT, January 1, 1970)</param>
         <summary>Sets the last-modified time of the file or directory named by this
             abstract pathname.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if and only if the operation succeeded;
-                     &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if and only if the operation succeeded;
+                     <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -2183,14 +2199,15 @@
         <Parameter Name="readable" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="readable">If &lt;code&gt;true&lt;/code&gt;, sets the access permission to allow read
-                     operations; if &lt;code&gt;false&lt;/code&gt; to disallow read operations</param>
+        <param name="readable">If <c>true</c>, sets the access permission to allow read
+                     operations; if <c>false</c> to disallow read operations</param>
         <summary>A convenience method to set the owner's read permission for this abstract
             pathname.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if and only if the operation succeeded.  The
+        <returns>
+          <c>true</c> if and only if the operation succeeded.  The
                      operation will fail if the user does not have permission to
                      change the access permissions of this abstract pathname.  If
-                     &lt;code&gt;readable&lt;/code&gt; is &lt;code&gt;false&lt;/code&gt; and the underlying
+                     <c>readable</c> is <c>false</c> and the underlying
                      file system does not implement a read permission, then the
                      operation will fail.</returns>
         <remarks>
@@ -2233,19 +2250,20 @@
         <Parameter Name="ownerOnly" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="readable">If &lt;code&gt;true&lt;/code&gt;, sets the access permission to allow read
-                     operations; if &lt;code&gt;false&lt;/code&gt; to disallow read operations</param>
-        <param name="ownerOnly">If &lt;code&gt;true&lt;/code&gt;, the read permission applies only to the
+        <param name="readable">If <c>true</c>, sets the access permission to allow read
+                     operations; if <c>false</c> to disallow read operations</param>
+        <param name="ownerOnly">If <c>true</c>, the read permission applies only to the
                      owner's read permission; otherwise, it applies to everybody.  If
                      the underlying file system can not distinguish the owner's read
                      permission from that of others, then the permission will apply to
                      everybody, regardless of this value.</param>
         <summary>Sets the owner's or everybody's read permission for this abstract
             pathname.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if and only if the operation succeeded.  The
+        <returns>
+          <c>true</c> if and only if the operation succeeded.  The
                      operation will fail if the user does not have permission to
                      change the access permissions of this abstract pathname.  If
-                     &lt;code&gt;readable&lt;/code&gt; is &lt;code&gt;false&lt;/code&gt; and the underlying
+                     <c>readable</c> is <c>false</c> and the underlying
                      file system does not implement a read permission, then the
                      operation will fail.</returns>
         <remarks>
@@ -2286,8 +2304,9 @@
       <Docs>
         <summary>Marks the file or directory named by this abstract pathname so that
             only read operations are allowed.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if and only if the operation succeeded;
-                     &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if and only if the operation succeeded;
+                     <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -2327,11 +2346,12 @@
         <Parameter Name="writable" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="writable">If &lt;code&gt;true&lt;/code&gt;, sets the access permission to allow write
-                     operations; if &lt;code&gt;false&lt;/code&gt; to disallow write operations</param>
+        <param name="writable">If <c>true</c>, sets the access permission to allow write
+                     operations; if <c>false</c> to disallow write operations</param>
         <summary>A convenience method to set the owner's write permission for this abstract
             pathname.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if and only if the operation succeeded.  The
+        <returns>
+          <c>true</c> if and only if the operation succeeded.  The
                      operation will fail if the user does not have permission to
                      change the access permissions of this abstract pathname.</returns>
         <remarks>
@@ -2374,16 +2394,17 @@
         <Parameter Name="ownerOnly" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="writable">If &lt;code&gt;true&lt;/code&gt;, sets the access permission to allow write
-                     operations; if &lt;code&gt;false&lt;/code&gt; to disallow write operations</param>
-        <param name="ownerOnly">If &lt;code&gt;true&lt;/code&gt;, the write permission applies only to the
+        <param name="writable">If <c>true</c>, sets the access permission to allow write
+                     operations; if <c>false</c> to disallow write operations</param>
+        <param name="ownerOnly">If <c>true</c>, the write permission applies only to the
                      owner's write permission; otherwise, it applies to everybody.  If
                      the underlying file system can not distinguish the owner's write
                      permission from that of others, then the permission will apply to
                      everybody, regardless of this value.</param>
         <summary>Sets the owner's or everybody's write permission for this abstract
             pathname.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if and only if the operation succeeded. The
+        <returns>
+          <c>true</c> if and only if the operation succeeded. The
                      operation will fail if the user does not have permission to change
                      the access permissions of this abstract pathname.</returns>
         <remarks>
@@ -2605,7 +2626,7 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Converts this abstract pathname into a &lt;code&gt;file:&lt;/code&gt; URL.</summary>
+        <summary>Converts this abstract pathname into a <c>file:</c> URL.</summary>
         <returns>A URL object representing the equivalent file URL</returns>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/FileDescriptor.xml b/docs/Mono.Android/en/Java.IO/FileDescriptor.xml
index 8ed4610cbb..aa8b25d709 100644
--- a/docs/Mono.Android/en/Java.IO/FileDescriptor.xml
+++ b/docs/Mono.Android/en/Java.IO/FileDescriptor.xml
@@ -335,9 +335,10 @@
       <Parameters />
       <Docs>
         <summary>Tests if this file descriptor object is valid.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if the file descriptor object represents a
+        <returns>
+          <c>true</c> if the file descriptor object represents a
                      valid, open file, socket, or other active I/O connection;
-                     &lt;code&gt;false&lt;/code&gt; otherwise.</returns>
+                     <c>false</c> otherwise.</returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.IO/FileInputStream.xml b/docs/Mono.Android/en/Java.IO/FileInputStream.xml
index ee5ea6fd39..91c4bb94f8 100644
--- a/docs/Mono.Android/en/Java.IO/FileInputStream.xml
+++ b/docs/Mono.Android/en/Java.IO/FileInputStream.xml
@@ -31,7 +31,7 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>A &lt;code&gt;FileInputStream&lt;/code&gt; obtains input bytes
+    <summary>A <c>FileInputStream</c> obtains input bytes
             from a file in a file system.</summary>
     <remarks>
       <para>
@@ -69,10 +69,10 @@
       </Parameters>
       <Docs>
         <param name="file">the file to be opened for reading.</param>
-        <summary>Creates a &lt;code&gt;FileInputStream&lt;/code&gt; by
+        <summary>Creates a <c>FileInputStream</c> by
             opening a connection to an actual file,
-            the file named by the &lt;code&gt;File&lt;/code&gt;
-            object &lt;code&gt;file&lt;/code&gt; in the file system.</summary>
+            the file named by the <c>File</c>
+            object <c>file</c> in the file system.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -111,8 +111,8 @@
       </Parameters>
       <Docs>
         <param name="fdObj">the file descriptor to be opened for reading.</param>
-        <summary>Creates a &lt;code&gt;FileInputStream&lt;/code&gt; by using the file descriptor
-            &lt;code&gt;fdObj&lt;/code&gt;, which represents an existing connection to an
+        <summary>Creates a <c>FileInputStream</c> by using the file descriptor
+            <c>fdObj</c>, which represents an existing connection to an
             actual file in the file system.</summary>
         <remarks>
           <para>
@@ -152,9 +152,9 @@
       </Parameters>
       <Docs>
         <param name="name">the system-dependent file name.</param>
-        <summary>Creates a &lt;code&gt;FileInputStream&lt;/code&gt; by
+        <summary>Creates a <c>FileInputStream</c> by
             opening a connection to an actual file,
-            the file named by the path name &lt;code&gt;name&lt;/code&gt;
+            the file named by the path name <c>name</c>
             in the file system.</summary>
         <remarks>
           <para>
@@ -253,10 +253,10 @@
         <ReturnType>Java.IO.FileDescriptor</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Returns the &lt;code&gt;FileDescriptor&lt;/code&gt;
+        <summary>Returns the <c>FileDescriptor</c>
             object  that represents the connection to
             the actual file in the file system being
-            used by this &lt;code&gt;FileInputStream&lt;/code&gt;.</summary>
+            used by this <c>FileInputStream</c>.</summary>
         <value>the file descriptor object associated with this stream.</value>
         <remarks>
           <para>
@@ -330,7 +330,7 @@
       <Parameters />
       <Docs>
         <summary>Reads a byte of data from this input stream.</summary>
-        <returns>the next byte of data, or &lt;code&gt;-1&lt;/code&gt; if the end of the
+        <returns>the next byte of data, or <c>-1</c> if the end of the
                         file is reached.</returns>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/FileNotFoundException.xml b/docs/Mono.Android/en/Java.IO/FileNotFoundException.xml
index 50b0acc5a6..422086ced6 100644
--- a/docs/Mono.Android/en/Java.IO/FileNotFoundException.xml
+++ b/docs/Mono.Android/en/Java.IO/FileNotFoundException.xml
@@ -52,8 +52,8 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <summary>Constructs a &lt;code&gt;FileNotFoundException&lt;/code&gt; with
-            &lt;code&gt;null&lt;/code&gt; as its error detail message.</summary>
+        <summary>Constructs a <c>FileNotFoundException</c> with
+            <c>null</c> as its error detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -90,7 +90,7 @@
       </Parameters>
       <Docs>
         <param name="s">the detail message.</param>
-        <summary>Constructs a &lt;code&gt;FileNotFoundException&lt;/code&gt; with the
+        <summary>Constructs a <c>FileNotFoundException</c> with the
             specified detail message.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/FileOutputStream.xml b/docs/Mono.Android/en/Java.IO/FileOutputStream.xml
index 8dcf20eb76..511ad797b7 100644
--- a/docs/Mono.Android/en/Java.IO/FileOutputStream.xml
+++ b/docs/Mono.Android/en/Java.IO/FileOutputStream.xml
@@ -32,7 +32,7 @@
   </Attributes>
   <Docs since="1">
     <summary>A file output stream is an output stream for writing data to a
-            &lt;code&gt;File&lt;/code&gt; or to a &lt;code&gt;FileDescriptor&lt;/code&gt;.</summary>
+            <c>File</c> or to a <c>FileDescriptor</c>.</summary>
     <remarks>
       <para>
         <format type="text/html">
@@ -70,7 +70,7 @@
       <Docs>
         <param name="file">the file to be opened for writing.</param>
         <summary>Creates a file output stream to write to the file represented by
-            the specified &lt;code&gt;File&lt;/code&gt; object.</summary>
+            the specified <c>File</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -191,10 +191,10 @@
       </Parameters>
       <Docs>
         <param name="file">the file to be opened for writing.</param>
-        <param name="append">if &lt;code&gt;true&lt;/code&gt;, then bytes will be written
+        <param name="append">if <c>true</c>, then bytes will be written
                               to the end of the file rather than the beginning</param>
         <summary>Creates a file output stream to write to the file represented by
-            the specified &lt;code&gt;File&lt;/code&gt; object.</summary>
+            the specified <c>File</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -257,7 +257,7 @@
       </Parameters>
       <Docs>
         <param name="name">the system-dependent file name</param>
-        <param name="append">if &lt;code&gt;true&lt;/code&gt;, then bytes will be written
+        <param name="append">if <c>true</c>, then bytes will be written
                               to the end of the file rather than the beginning</param>
         <summary>Creates a file output stream to write to the file with the specified
             name.</summary>
@@ -337,9 +337,9 @@
       </ReturnValue>
       <Docs>
         <summary>Returns the file descriptor associated with this stream.</summary>
-        <value>the &lt;code&gt;FileDescriptor&lt;/code&gt; object that represents
+        <value>the <c>FileDescriptor</c> object that represents
                      the connection to the file in the file system being used
-                     by this &lt;code&gt;FileOutputStream&lt;/code&gt; object.</value>
+                     by this <c>FileOutputStream</c> object.</value>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.IO/FileWriter.xml b/docs/Mono.Android/en/Java.IO/FileWriter.xml
index 675fa7ff40..8da19970c4 100644
--- a/docs/Mono.Android/en/Java.IO/FileWriter.xml
+++ b/docs/Mono.Android/en/Java.IO/FileWriter.xml
@@ -171,7 +171,7 @@
       </Parameters>
       <Docs>
         <param name="file">a File object to write to</param>
-        <param name="append">if &lt;code&gt;true&lt;/code&gt;, then bytes will be written
+        <param name="append">if <c>true</c>, then bytes will be written
                                  to the end of the file rather than the beginning</param>
         <summary>Constructs a FileWriter object given a File object.</summary>
         <remarks>
@@ -236,7 +236,7 @@
       </Parameters>
       <Docs>
         <param name="fileName">String The system-dependent filename.</param>
-        <param name="append">boolean if &lt;code&gt;true&lt;/code&gt;, then data will be written
+        <param name="append">boolean if <c>true</c>, then data will be written
                              to the end of the file rather than the beginning.</param>
         <summary>Constructs a FileWriter object given a file name with a boolean
             indicating whether or not to append the data written.</summary>
diff --git a/docs/Mono.Android/en/Java.IO/FilterInputStream.xml b/docs/Mono.Android/en/Java.IO/FilterInputStream.xml
index 65112b7f77..031fbb456b 100644
--- a/docs/Mono.Android/en/Java.IO/FilterInputStream.xml
+++ b/docs/Mono.Android/en/Java.IO/FilterInputStream.xml
@@ -18,7 +18,7 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>A &lt;code&gt;FilterInputStream&lt;/code&gt; contains
+    <summary>A <c>FilterInputStream</c> contains
             some other input stream, which it uses as
             its  basic source of data, possibly transforming
             the data along the way or providing  additional
@@ -58,11 +58,12 @@
         <Parameter Name="in" Type="System.IO.Stream" />
       </Parameters>
       <Docs>
-        <param name="in">the underlying input stream, or &lt;code&gt;null&lt;/code&gt; if
+        <param name="in">the underlying input stream, or <c>null</c> if
                      this instance is to be created without an underlying stream.</param>
-        <summary>Creates a &lt;code&gt;FilterInputStream&lt;/code&gt;
-            by assigning the  argument &lt;code&gt;in&lt;/code&gt;
-            to the field &lt;code&gt;this.</summary>
+        <summary>Creates a <c>FilterInputStream</c>
+            by assigning the  argument <c>in</c>
+            to the field <c>this.in</c> so as
+            to remember it for later use.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -191,7 +192,7 @@
       <Parameters />
       <Docs>
         <summary>Reads the next byte of data from this input stream.</summary>
-        <returns>the next byte of data, or &lt;code&gt;-1&lt;/code&gt; if the end of the
+        <returns>the next byte of data, or <c>-1</c> if the end of the
                         stream is reached.</returns>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/FilterOutputStream.xml b/docs/Mono.Android/en/Java.IO/FilterOutputStream.xml
index 0b20fddc8f..6a0a902837 100644
--- a/docs/Mono.Android/en/Java.IO/FilterOutputStream.xml
+++ b/docs/Mono.Android/en/Java.IO/FilterOutputStream.xml
@@ -57,7 +57,7 @@
       <Docs>
         <param name="out">the underlying output stream to be assigned to
                            the field <c>this.out</c> for later use, or
-                           &lt;code&gt;null&lt;/code&gt; if this instance is to be
+                           <c>null</c> if this instance is to be
                            created without an underlying stream.</param>
         <summary>Creates an output stream filter built on top of the specified
             underlying output stream.</summary>
@@ -252,8 +252,8 @@
         <Parameter Name="b" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="b">the &lt;code&gt;byte&lt;/code&gt;.</param>
-        <summary>Writes the specified &lt;code&gt;byte&lt;/code&gt; to this output stream.</summary>
+        <param name="b">the <c>byte</c>.</param>
+        <summary>Writes the specified <c>byte</c> to this output stream.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.IO/IDataOutput.xml b/docs/Mono.Android/en/Java.IO/IDataOutput.xml
index 469d0e41c6..cdddd49c14 100644
--- a/docs/Mono.Android/en/Java.IO/IDataOutput.xml
+++ b/docs/Mono.Android/en/Java.IO/IDataOutput.xml
@@ -25,7 +25,7 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>The &lt;code&gt;DataOutput&lt;/code&gt; interface provides
+    <summary>The <c>DataOutput</c> interface provides
             for converting data from any of the Java
             primitive types to a series of bytes and
             writing these bytes to a binary stream.</summary>
@@ -68,7 +68,7 @@
       </Parameters>
       <Docs>
         <param name="b">the data.</param>
-        <summary>Writes to the output stream all the bytes in array &lt;code&gt;b&lt;/code&gt;.</summary>
+        <summary>Writes to the output stream all the bytes in array <c>b</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -111,7 +111,7 @@
       <Docs>
         <param name="b">the byte to be written.</param>
         <summary>Writes to the output stream the eight
-            low-order bits of the argument &lt;code&gt;b&lt;/code&gt;.</summary>
+            low-order bits of the argument <c>b</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -157,8 +157,8 @@
         <param name="b">the data.</param>
         <param name="off">the start offset in the data.</param>
         <param name="len">the number of bytes to write.</param>
-        <summary>Writes &lt;code&gt;len&lt;/code&gt; bytes from array
-            &lt;code&gt;b&lt;/code&gt;, in order,  to
+        <summary>Writes <c>len</c> bytes from array
+            <c>b</c>, in order,  to
             the output stream.</summary>
         <remarks>
           <para>
@@ -201,7 +201,7 @@
       </Parameters>
       <Docs>
         <param name="v">the boolean to be written.</param>
-        <summary>Writes a &lt;code&gt;boolean&lt;/code&gt; value to this output stream.</summary>
+        <summary>Writes a <c>boolean</c> value to this output stream.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -244,7 +244,7 @@
       <Docs>
         <param name="v">the byte value to be written.</param>
         <summary>Writes to the output stream the eight low-
-            order bits of the argument &lt;code&gt;v&lt;/code&gt;.</summary>
+            order bits of the argument <c>v</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -328,8 +328,8 @@
         <Parameter Name="v" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="v">the &lt;code&gt;char&lt;/code&gt; value to be written.</param>
-        <summary>Writes a &lt;code&gt;char&lt;/code&gt; value, which
+        <param name="v">the <c>char</c> value to be written.</param>
+        <summary>Writes a <c>char</c> value, which
             is comprised of two bytes, to the
             output stream.</summary>
         <remarks>
@@ -373,7 +373,7 @@
       </Parameters>
       <Docs>
         <param name="s">the string value to be written.</param>
-        <summary>Writes every character in the string &lt;code&gt;s&lt;/code&gt;,
+        <summary>Writes every character in the string <c>s</c>,
             to the output stream, in order,
             two bytes per character.</summary>
         <remarks>
@@ -416,8 +416,8 @@
         <Parameter Name="v" Type="System.Double" />
       </Parameters>
       <Docs>
-        <param name="v">the &lt;code&gt;double&lt;/code&gt; value to be written.</param>
-        <summary>Writes a &lt;code&gt;double&lt;/code&gt; value,
+        <param name="v">the <c>double</c> value to be written.</param>
+        <summary>Writes a <c>double</c> value,
             which is comprised of eight bytes, to the output stream.</summary>
         <remarks>
           <para>
@@ -459,8 +459,8 @@
         <Parameter Name="v" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="v">the &lt;code&gt;float&lt;/code&gt; value to be written.</param>
-        <summary>Writes a &lt;code&gt;float&lt;/code&gt; value,
+        <param name="v">the <c>float</c> value to be written.</param>
+        <summary>Writes a <c>float</c> value,
             which is comprised of four bytes, to the output stream.</summary>
         <remarks>
           <para>
@@ -502,8 +502,8 @@
         <Parameter Name="v" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="v">the &lt;code&gt;int&lt;/code&gt; value to be written.</param>
-        <summary>Writes an &lt;code&gt;int&lt;/code&gt; value, which is
+        <param name="v">the <c>int</c> value to be written.</param>
+        <summary>Writes an <c>int</c> value, which is
             comprised of four bytes, to the output stream.</summary>
         <remarks>
           <para>
@@ -545,8 +545,8 @@
         <Parameter Name="v" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="v">the &lt;code&gt;long&lt;/code&gt; value to be written.</param>
-        <summary>Writes a &lt;code&gt;long&lt;/code&gt; value, which is
+        <param name="v">the <c>long</c> value to be written.</param>
+        <summary>Writes a <c>long</c> value, which is
             comprised of eight bytes, to the output stream.</summary>
         <remarks>
           <para>
@@ -588,7 +588,7 @@
         <Parameter Name="v" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="v">the &lt;code&gt;short&lt;/code&gt; value to be written.</param>
+        <param name="v">the <c>short</c> value to be written.</param>
         <summary>Writes two bytes to the output
             stream to represent the value of the argument.</summary>
         <remarks>
diff --git a/docs/Mono.Android/en/Java.IO/IFileFilter.xml b/docs/Mono.Android/en/Java.IO/IFileFilter.xml
index 0145d7b610..4bb8267c89 100644
--- a/docs/Mono.Android/en/Java.IO/IFileFilter.xml
+++ b/docs/Mono.Android/en/Java.IO/IFileFilter.xml
@@ -67,7 +67,8 @@
         <param name="pathname">The abstract pathname to be tested</param>
         <summary>Tests whether or not the specified abstract pathname should be
             included in a pathname list.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if and only if &lt;code&gt;pathname&lt;/code&gt;
+        <returns>
+          <c>true</c> if and only if <c>pathname</c>
                      should be included</returns>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/IFilenameFilter.xml b/docs/Mono.Android/en/Java.IO/IFilenameFilter.xml
index b58af6dfae..2bfe94f990 100644
--- a/docs/Mono.Android/en/Java.IO/IFilenameFilter.xml
+++ b/docs/Mono.Android/en/Java.IO/IFilenameFilter.xml
@@ -69,8 +69,9 @@
         <param name="dir">the directory in which the file was found.</param>
         <param name="name">the name of the file.</param>
         <summary>Tests if a specified file should be included in a file list.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if and only if the name should be
-            included in the file list; &lt;code&gt;false&lt;/code&gt; otherwise.</returns>
+        <returns>
+          <c>true</c> if and only if the name should be
+            included in the file list; <c>false</c> otherwise.</returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.IO/InputStream.xml b/docs/Mono.Android/en/Java.IO/InputStream.xml
index 9c66d66c27..ab4f49a13d 100644
--- a/docs/Mono.Android/en/Java.IO/InputStream.xml
+++ b/docs/Mono.Android/en/Java.IO/InputStream.xml
@@ -280,10 +280,11 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Tests if this input stream supports the &lt;code&gt;mark&lt;/code&gt; and
-            &lt;code&gt;reset&lt;/code&gt; methods.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if this stream instance supports the mark
-                     and reset methods; &lt;code&gt;false&lt;/code&gt; otherwise.</returns>
+        <summary>Tests if this input stream supports the <c>mark</c> and
+            <c>reset</c> methods.</summary>
+        <returns>
+          <c>true</c> if this stream instance supports the mark
+                     and reset methods; <c>false</c> otherwise.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -323,7 +324,7 @@
       <Parameters />
       <Docs>
         <summary>Reads the next byte of data from the input stream.</summary>
-        <returns>the next byte of data, or &lt;code&gt;-1&lt;/code&gt; if the end of the
+        <returns>the next byte of data, or <c>-1</c> if the end of the
                         stream is reached.</returns>
         <remarks>
           <para>
@@ -367,9 +368,9 @@
       <Docs>
         <param name="b">the buffer into which the data is read.</param>
         <summary>Reads some number of bytes from the input stream and stores them into
-            the buffer array &lt;code&gt;b&lt;/code&gt;.</summary>
+            the buffer array <c>b</c>.</summary>
         <returns>the total number of bytes read into the buffer, or
-                        &lt;code&gt;-1&lt;/code&gt; if there is no more data because the end of
+                        <c>-1</c> if there is no more data because the end of
                         the stream has been reached.</returns>
         <remarks>
           <para>
@@ -413,13 +414,13 @@
       </Parameters>
       <Docs>
         <param name="b">the buffer into which the data is read.</param>
-        <param name="off">the start offset in array &lt;code&gt;b&lt;/code&gt;
+        <param name="off">the start offset in array <c>b</c>
                               at which the data is written.</param>
         <param name="len">the maximum number of bytes to read.</param>
-        <summary>Reads up to &lt;code&gt;len&lt;/code&gt; bytes of data from the input stream into
+        <summary>Reads up to <c>len</c> bytes of data from the input stream into
             an array of bytes.</summary>
         <returns>the total number of bytes read into the buffer, or
-                        &lt;code&gt;-1&lt;/code&gt; if there is no more data because the end of
+                        <c>-1</c> if there is no more data because the end of
                         the stream has been reached.</returns>
         <remarks>
           <para>
@@ -537,7 +538,7 @@
       <Parameters />
       <Docs>
         <summary>Repositions this stream to the position at the time the
-            &lt;code&gt;mark&lt;/code&gt; method was last called on this input stream.</summary>
+            <c>mark</c> method was last called on this input stream.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -579,7 +580,7 @@
       </Parameters>
       <Docs>
         <param name="n">the number of bytes to be skipped.</param>
-        <summary>Skips over and discards &lt;code&gt;n&lt;/code&gt; bytes of data from this input
+        <summary>Skips over and discards <c>n</c> bytes of data from this input
             stream.</summary>
         <returns>the actual number of bytes skipped.</returns>
         <remarks>
diff --git a/docs/Mono.Android/en/Java.IO/InputStreamReader.xml b/docs/Mono.Android/en/Java.IO/InputStreamReader.xml
index 185a84c7dc..48b7945bb4 100644
--- a/docs/Mono.Android/en/Java.IO/InputStreamReader.xml
+++ b/docs/Mono.Android/en/Java.IO/InputStreamReader.xml
@@ -268,7 +268,7 @@
       <Docs>
         <summary>Returns the name of the character encoding being used by this stream.</summary>
         <value>The historical name of this encoding, or
-                    &lt;code&gt;null&lt;/code&gt; if the stream has been closed</value>
+                    <c>null</c> if the stream has been closed</value>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.IO/InterruptedIOException.xml b/docs/Mono.Android/en/Java.IO/InterruptedIOException.xml
index 02a9c39bfc..ec9115f10a 100644
--- a/docs/Mono.Android/en/Java.IO/InterruptedIOException.xml
+++ b/docs/Mono.Android/en/Java.IO/InterruptedIOException.xml
@@ -51,8 +51,8 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <summary>Constructs an &lt;code&gt;InterruptedIOException&lt;/code&gt; with
-            &lt;code&gt;null&lt;/code&gt; as its error detail message.</summary>
+        <summary>Constructs an <c>InterruptedIOException</c> with
+            <c>null</c> as its error detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -89,7 +89,7 @@
       </Parameters>
       <Docs>
         <param name="s">the detail message.</param>
-        <summary>Constructs an &lt;code&gt;InterruptedIOException&lt;/code&gt; with the
+        <summary>Constructs an <c>InterruptedIOException</c> with the
             specified detail message.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/InvalidObjectException.xml b/docs/Mono.Android/en/Java.IO/InvalidObjectException.xml
index c7fa86f6b3..eca012a3f8 100644
--- a/docs/Mono.Android/en/Java.IO/InvalidObjectException.xml
+++ b/docs/Mono.Android/en/Java.IO/InvalidObjectException.xml
@@ -56,7 +56,7 @@
       </Parameters>
       <Docs>
         <param name="reason">Detailed message explaining the reason for the failure.</param>
-        <summary>Constructs an &lt;code&gt;InvalidObjectException&lt;/code&gt;.</summary>
+        <summary>Constructs an <c>InvalidObjectException</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.IO/ObjectInputStream+GetField.xml b/docs/Mono.Android/en/Java.IO/ObjectInputStream+GetField.xml
index 011691d275..20d58d6c5e 100644
--- a/docs/Mono.Android/en/Java.IO/ObjectInputStream+GetField.xml
+++ b/docs/Mono.Android/en/Java.IO/ObjectInputStream+GetField.xml
@@ -153,10 +153,10 @@
       </Parameters>
       <Docs>
         <param name="name">the name of the field</param>
-        <param name="val">the default value to use if &lt;code&gt;name&lt;/code&gt; does not
+        <param name="val">the default value to use if <c>name</c> does not
                     have a value</param>
         <summary>Get the value of the named Object field from the persistent field.</summary>
-        <returns>the value of the named &lt;code&gt;Object&lt;/code&gt; field</returns>
+        <returns>the value of the named <c>Object</c> field</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -202,10 +202,10 @@
       </Parameters>
       <Docs>
         <param name="name">the name of the field</param>
-        <param name="val">the default value to use if &lt;code&gt;name&lt;/code&gt; does not
+        <param name="val">the default value to use if <c>name</c> does not
                     have a value</param>
         <summary>Get the value of the named boolean field from the persistent field.</summary>
-        <returns>the value of the named &lt;code&gt;boolean&lt;/code&gt; field</returns>
+        <returns>the value of the named <c>boolean</c> field</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -251,10 +251,10 @@
       </Parameters>
       <Docs>
         <param name="name">the name of the field</param>
-        <param name="val">the default value to use if &lt;code&gt;name&lt;/code&gt; does not
+        <param name="val">the default value to use if <c>name</c> does not
                     have a value</param>
         <summary>Get the value of the named char field from the persistent field.</summary>
-        <returns>the value of the named &lt;code&gt;char&lt;/code&gt; field</returns>
+        <returns>the value of the named <c>char</c> field</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -300,10 +300,10 @@
       </Parameters>
       <Docs>
         <param name="name">the name of the field</param>
-        <param name="val">the default value to use if &lt;code&gt;name&lt;/code&gt; does not
+        <param name="val">the default value to use if <c>name</c> does not
                     have a value</param>
         <summary>Get the value of the named double field from the persistent field.</summary>
-        <returns>the value of the named &lt;code&gt;double&lt;/code&gt; field</returns>
+        <returns>the value of the named <c>double</c> field</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -349,10 +349,10 @@
       </Parameters>
       <Docs>
         <param name="name">the name of the field</param>
-        <param name="val">the default value to use if &lt;code&gt;name&lt;/code&gt; does not
+        <param name="val">the default value to use if <c>name</c> does not
                     have a value</param>
         <summary>Get the value of the named short field from the persistent field.</summary>
-        <returns>the value of the named &lt;code&gt;short&lt;/code&gt; field</returns>
+        <returns>the value of the named <c>short</c> field</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -398,10 +398,10 @@
       </Parameters>
       <Docs>
         <param name="name">the name of the field</param>
-        <param name="val">the default value to use if &lt;code&gt;name&lt;/code&gt; does not
+        <param name="val">the default value to use if <c>name</c> does not
                     have a value</param>
         <summary>Get the value of the named int field from the persistent field.</summary>
-        <returns>the value of the named &lt;code&gt;int&lt;/code&gt; field</returns>
+        <returns>the value of the named <c>int</c> field</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -447,10 +447,10 @@
       </Parameters>
       <Docs>
         <param name="name">the name of the field</param>
-        <param name="val">the default value to use if &lt;code&gt;name&lt;/code&gt; does not
+        <param name="val">the default value to use if <c>name</c> does not
                     have a value</param>
         <summary>Get the value of the named long field from the persistent field.</summary>
-        <returns>the value of the named &lt;code&gt;long&lt;/code&gt; field</returns>
+        <returns>the value of the named <c>long</c> field</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -496,10 +496,10 @@
       </Parameters>
       <Docs>
         <param name="name">the name of the field</param>
-        <param name="val">the default value to use if &lt;code&gt;name&lt;/code&gt; does not
+        <param name="val">the default value to use if <c>name</c> does not
                     have a value</param>
         <summary>Get the value of the named byte field from the persistent field.</summary>
-        <returns>the value of the named &lt;code&gt;byte&lt;/code&gt; field</returns>
+        <returns>the value of the named <c>byte</c> field</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -545,10 +545,10 @@
       </Parameters>
       <Docs>
         <param name="name">the name of the field</param>
-        <param name="val">the default value to use if &lt;code&gt;name&lt;/code&gt; does not
+        <param name="val">the default value to use if <c>name</c> does not
                     have a value</param>
         <summary>Get the value of the named float field from the persistent field.</summary>
-        <returns>the value of the named &lt;code&gt;float&lt;/code&gt; field</returns>
+        <returns>the value of the named <c>float</c> field</returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.IO/ObjectInputStream.xml b/docs/Mono.Android/en/Java.IO/ObjectInputStream.xml
index f8509e8e5f..b8d797201c 100644
--- a/docs/Mono.Android/en/Java.IO/ObjectInputStream.xml
+++ b/docs/Mono.Android/en/Java.IO/ObjectInputStream.xml
@@ -217,7 +217,7 @@
         <Parameter Name="enable" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="enable">true for enabling use of &lt;code&gt;resolveObject&lt;/code&gt; for
+        <param name="enable">true for enabling use of <c>resolveObject</c> for
                      every object being deserialized</param>
         <summary>Enable the stream to allow objects read from the stream to be replaced.</summary>
         <returns>the previous setting before this method was invoked</returns>
@@ -1285,10 +1285,10 @@
         <Parameter Name="desc" Type="Java.IO.ObjectStreamClass" />
       </Parameters>
       <Docs>
-        <param name="desc">an instance of class &lt;code&gt;ObjectStreamClass&lt;/code&gt;</param>
+        <param name="desc">an instance of class <c>ObjectStreamClass</c></param>
         <summary>Load the local class equivalent of the specified stream class
             description.</summary>
-        <returns>a &lt;code&gt;Class&lt;/code&gt; object corresponding to &lt;code&gt;desc&lt;/code&gt;</returns>
+        <returns>a <c>Class</c> object corresponding to <c>desc</c></returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.IO/ObjectOutputStream+PutField.xml b/docs/Mono.Android/en/Java.IO/ObjectOutputStream+PutField.xml
index 8c20a55697..056f65d757 100644
--- a/docs/Mono.Android/en/Java.IO/ObjectOutputStream+PutField.xml
+++ b/docs/Mono.Android/en/Java.IO/ObjectOutputStream+PutField.xml
@@ -140,7 +140,7 @@
       <Docs>
         <param name="name">the name of the serializable field</param>
         <param name="val">the value to assign to the field
-                    (which may be &lt;code&gt;null&lt;/code&gt;)</param>
+                    (which may be <c>null</c>)</param>
         <summary>Put the value of the named Object field into the persistent field.</summary>
         <remarks>
           <para>
@@ -585,7 +585,7 @@
         <param name="out">the stream to write the data and fields to</param>
         <summary>Write the data and fields to the specified ObjectOutput stream,
             which must be the same stream that produced this
-            &lt;code&gt;PutField&lt;/code&gt; object.</summary>
+            <c>PutField</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.IO/ObjectStreamClass.xml b/docs/Mono.Android/en/Java.IO/ObjectStreamClass.xml
index 74bacc937d..760f5c444e 100644
--- a/docs/Mono.Android/en/Java.IO/ObjectStreamClass.xml
+++ b/docs/Mono.Android/en/Java.IO/ObjectStreamClass.xml
@@ -92,7 +92,7 @@
       <Parameters />
       <Docs>
         <summary>Return the class in the local VM that this version is mapped to.</summary>
-        <returns>the &lt;code&gt;Class&lt;/code&gt; instance that this descriptor represents</returns>
+        <returns>the <c>Class</c> instance that this descriptor represents</returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.IO/ObjectStreamField.xml b/docs/Mono.Android/en/Java.IO/ObjectStreamField.xml
index 6e2de2d472..361c4e9d26 100644
--- a/docs/Mono.Android/en/Java.IO/ObjectStreamField.xml
+++ b/docs/Mono.Android/en/Java.IO/ObjectStreamField.xml
@@ -92,7 +92,7 @@
       </Parameters>
       <Docs>
         <param name="name">the name of the serializable field</param>
-        <param name="type">the &lt;code&gt;Class&lt;/code&gt; object of the serializable field</param>
+        <param name="type">the <c>Class</c> object of the serializable field</param>
         <summary>Create a Serializable field with the specified type.</summary>
         <remarks>
           <para>
@@ -175,7 +175,7 @@
       </Parameters>
       <Docs>
         <param name="obj">To be added.</param>
-        <summary>Compare this field with another &lt;code&gt;ObjectStreamField&lt;/code&gt;.</summary>
+        <summary>Compare this field with another <c>ObjectStreamField</c>.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
@@ -351,7 +351,7 @@
       </ReturnValue>
       <Docs>
         <summary>Get the name of this field.</summary>
-        <value>a &lt;code&gt;String&lt;/code&gt; representing the name of the serializable
+        <value>a <c>String</c> representing the name of the serializable
                      field</value>
         <remarks>
           <para>
@@ -524,7 +524,7 @@
       </ReturnValue>
       <Docs>
         <summary>Get the type of the field.</summary>
-        <value>a &lt;code&gt;Class&lt;/code&gt; object representing the type of the
+        <value>a <c>Class</c> object representing the type of the
                      serializable field</value>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/OutputStream.xml b/docs/Mono.Android/en/Java.IO/OutputStream.xml
index b8361768a7..6aaf919a31 100644
--- a/docs/Mono.Android/en/Java.IO/OutputStream.xml
+++ b/docs/Mono.Android/en/Java.IO/OutputStream.xml
@@ -304,7 +304,8 @@
       </Parameters>
       <Docs>
         <param name="b">the data.</param>
-        <summary>Writes &lt;code&gt;b.</summary>
+        <summary>Writes <c>b.length</c> bytes from the specified byte array
+            to this output stream.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -344,7 +345,7 @@
         <Parameter Name="b" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="b">the &lt;code&gt;byte&lt;/code&gt;.</param>
+        <param name="b">the <c>byte</c>.</param>
         <summary>Writes the specified byte to this output stream.</summary>
         <remarks>
           <para>
@@ -391,8 +392,8 @@
         <param name="b">the data.</param>
         <param name="off">the start offset in the data.</param>
         <param name="len">the number of bytes to write.</param>
-        <summary>Writes &lt;code&gt;len&lt;/code&gt; bytes from the specified byte array
-            starting at offset &lt;code&gt;off&lt;/code&gt; to this output stream.</summary>
+        <summary>Writes <c>len</c> bytes from the specified byte array
+            starting at offset <c>off</c> to this output stream.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.IO/OutputStreamWriter.xml b/docs/Mono.Android/en/Java.IO/OutputStreamWriter.xml
index c4d5dbfc82..f5515db57e 100644
--- a/docs/Mono.Android/en/Java.IO/OutputStreamWriter.xml
+++ b/docs/Mono.Android/en/Java.IO/OutputStreamWriter.xml
@@ -268,7 +268,7 @@
       <Docs>
         <summary>Returns the name of the character encoding being used by this stream.</summary>
         <value>The historical name of this encoding, or possibly
-                    &lt;code&gt;null&lt;/code&gt; if the stream has been closed</value>
+                    <c>null</c> if the stream has been closed</value>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.IO/PipedInputStream.xml b/docs/Mono.Android/en/Java.IO/PipedInputStream.xml
index cc887d210a..2951898659 100644
--- a/docs/Mono.Android/en/Java.IO/PipedInputStream.xml
+++ b/docs/Mono.Android/en/Java.IO/PipedInputStream.xml
@@ -54,7 +54,7 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <summary>Creates a &lt;code&gt;PipedInputStream&lt;/code&gt; so
+        <summary>Creates a <c>PipedInputStream</c> so
             that it is not yet #connect(java.</summary>
         <remarks>
           <para>
@@ -92,9 +92,9 @@
       </Parameters>
       <Docs>
         <param name="src">the stream to connect to.</param>
-        <summary>Creates a &lt;code&gt;PipedInputStream&lt;/code&gt; so
+        <summary>Creates a <c>PipedInputStream</c> so
             that it is connected to the piped output
-            stream &lt;code&gt;src&lt;/code&gt;.</summary>
+            stream <c>src</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -133,7 +133,7 @@
       </Parameters>
       <Docs>
         <param name="pipeSize">the size of the pipe's buffer.</param>
-        <summary>Creates a &lt;code&gt;PipedInputStream&lt;/code&gt; so that it is not yet
+        <summary>Creates a <c>PipedInputStream</c> so that it is not yet
             #connect(java.</summary>
         <remarks>
           <para>
@@ -174,9 +174,9 @@
       <Docs>
         <param name="src">the stream to connect to.</param>
         <param name="pipeSize">the size of the pipe's buffer.</param>
-        <summary>Creates a &lt;code&gt;PipedInputStream&lt;/code&gt; so that it is
+        <summary>Creates a <c>PipedInputStream</c> so that it is
             connected to the piped output stream
-            &lt;code&gt;src&lt;/code&gt; and uses the specified pipe size for
+            <c>src</c> and uses the specified pipe size for
             the pipe's buffer.</summary>
         <remarks>
           <para>
@@ -280,7 +280,7 @@
       <Docs>
         <param name="src">The piped output stream to connect to.</param>
         <summary>Causes this piped input stream to be connected
-            to the piped  output stream &lt;code&gt;src&lt;/code&gt;.</summary>
+            to the piped  output stream <c>src</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -465,7 +465,7 @@
       <Parameters />
       <Docs>
         <summary>Reads the next byte of data from this piped input stream.</summary>
-        <returns>the next byte of data, or &lt;code&gt;-1&lt;/code&gt; if the end of the
+        <returns>the next byte of data, or <c>-1</c> if the end of the
                         stream is reached.</returns>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/PipedOutputStream.xml b/docs/Mono.Android/en/Java.IO/PipedOutputStream.xml
index 6ddc568cd5..b0e2c5bc64 100644
--- a/docs/Mono.Android/en/Java.IO/PipedOutputStream.xml
+++ b/docs/Mono.Android/en/Java.IO/PipedOutputStream.xml
@@ -290,8 +290,8 @@
         <Parameter Name="b" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="b">the &lt;code&gt;byte&lt;/code&gt; to be written.</param>
-        <summary>Writes the specified &lt;code&gt;byte&lt;/code&gt; to the piped output stream.</summary>
+        <param name="b">the <c>byte</c> to be written.</param>
+        <summary>Writes the specified <c>byte</c> to the piped output stream.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.IO/PipedReader.xml b/docs/Mono.Android/en/Java.IO/PipedReader.xml
index 7bd77f8848..ac5e470e23 100644
--- a/docs/Mono.Android/en/Java.IO/PipedReader.xml
+++ b/docs/Mono.Android/en/Java.IO/PipedReader.xml
@@ -51,7 +51,7 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <summary>Creates a &lt;code&gt;PipedReader&lt;/code&gt; so
+        <summary>Creates a <c>PipedReader</c> so
             that it is not yet #connect(java.</summary>
         <remarks>
           <para>
@@ -89,9 +89,9 @@
       </Parameters>
       <Docs>
         <param name="src">the stream to connect to.</param>
-        <summary>Creates a &lt;code&gt;PipedReader&lt;/code&gt; so
+        <summary>Creates a <c>PipedReader</c> so
             that it is connected to the piped writer
-            &lt;code&gt;src&lt;/code&gt;.</summary>
+            <c>src</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -130,7 +130,7 @@
       </Parameters>
       <Docs>
         <param name="pipeSize">the size of the pipe's buffer.</param>
-        <summary>Creates a &lt;code&gt;PipedReader&lt;/code&gt; so that it is not yet
+        <summary>Creates a <c>PipedReader</c> so that it is not yet
             <c>#connect(java.io.PipedWriter) connected</c> and uses
             the specified pipe size for the pipe's buffer.</summary>
         <remarks>
@@ -172,8 +172,8 @@
       <Docs>
         <param name="src">the stream to connect to.</param>
         <param name="pipeSize">the size of the pipe's buffer.</param>
-        <summary>Creates a &lt;code&gt;PipedReader&lt;/code&gt; so that it is connected
-            to the piped writer &lt;code&gt;src&lt;/code&gt; and uses the specified
+        <summary>Creates a <c>PipedReader</c> so that it is connected
+            to the piped writer <c>src</c> and uses the specified
             pipe size for the pipe's buffer.</summary>
         <remarks>
           <para>
@@ -280,7 +280,7 @@
       <Docs>
         <param name="src">The piped writer to connect to.</param>
         <summary>Causes this piped reader to be connected
-            to the piped  writer &lt;code&gt;src&lt;/code&gt;.</summary>
+            to the piped  writer <c>src</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -357,10 +357,10 @@
         <param name="cbuf">the buffer into which the data is read.</param>
         <param name="off">the start offset of the data.</param>
         <param name="len">the maximum number of characters read.</param>
-        <summary>Reads up to &lt;code&gt;len&lt;/code&gt; characters of data from this piped
+        <summary>Reads up to <c>len</c> characters of data from this piped
             stream into an array of characters.</summary>
         <returns>the total number of characters read into the buffer, or
-                        &lt;code&gt;-1&lt;/code&gt; if there is no more data because the end of
+                        <c>-1</c> if there is no more data because the end of
                         the stream has been reached.</returns>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/PipedWriter.xml b/docs/Mono.Android/en/Java.IO/PipedWriter.xml
index 3993796394..435dadec5f 100644
--- a/docs/Mono.Android/en/Java.IO/PipedWriter.xml
+++ b/docs/Mono.Android/en/Java.IO/PipedWriter.xml
@@ -375,8 +375,8 @@
         <param name="cbuf">the data.</param>
         <param name="off">the start offset in the data.</param>
         <param name="len">the number of characters to write.</param>
-        <summary>Writes &lt;code&gt;len&lt;/code&gt; characters from the specified character array
-            starting at offset &lt;code&gt;off&lt;/code&gt; to this piped output stream.</summary>
+        <summary>Writes <c>len</c> characters from the specified character array
+            starting at offset <c>off</c> to this piped output stream.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.IO/PrintStream.xml b/docs/Mono.Android/en/Java.IO/PrintStream.xml
index bdc625e1bf..ac4d31dc2a 100644
--- a/docs/Mono.Android/en/Java.IO/PrintStream.xml
+++ b/docs/Mono.Android/en/Java.IO/PrintStream.xml
@@ -34,7 +34,7 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>A &lt;code&gt;PrintStream&lt;/code&gt; adds functionality to another output stream,
+    <summary>A <c>PrintStream</c> adds functionality to another output stream,
             namely the ability to print representations of various data values
             conveniently.</summary>
     <remarks>
@@ -274,8 +274,8 @@
                                printed</param>
         <param name="autoFlush">A boolean; if true, the output buffer will be flushed
                                whenever a byte array is written, one of the
-                               &lt;code&gt;println&lt;/code&gt; methods is invoked, or a newline
-                               character or byte (&lt;code&gt;'\n'&lt;/code&gt;) is written</param>
+                               <c>println</c> methods is invoked, or a newline
+                               character or byte (<c>'\n'</c>) is written</param>
         <summary>Creates a new print stream.</summary>
         <remarks>
           <para>
@@ -368,8 +368,8 @@
                                printed</param>
         <param name="autoFlush">A boolean; if true, the output buffer will be flushed
                                whenever a byte array is written, one of the
-                               &lt;code&gt;println&lt;/code&gt; methods is invoked, or a newline
-                               character or byte (&lt;code&gt;'\n'&lt;/code&gt;) is written</param>
+                               <c>println</c> methods is invoked, or a newline
+                               character or byte (<c>'\n'</c>) is written</param>
         <param name="encoding">The name of a supported
                                "../lang/package-summary.html#charenc"&gt;
                                character encoding</param>
@@ -707,10 +707,11 @@
       <Parameters />
       <Docs>
         <summary>Flushes the stream and checks its error state.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if and only if this stream has encountered an
-                    &lt;code&gt;IOException&lt;/code&gt; other than
-                    &lt;code&gt;InterruptedIOException&lt;/code&gt;, or the
-                    &lt;code&gt;setError&lt;/code&gt; method has been invoked</returns>
+        <returns>
+          <c>true</c> if and only if this stream has encountered an
+                    <c>IOException</c> other than
+                    <c>InterruptedIOException</c>, or the
+                    <c>setError</c> method has been invoked</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1011,7 +1012,7 @@
         <Parameter Name="obj" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="obj">The &lt;code&gt;Object&lt;/code&gt; to be printed</param>
+        <param name="obj">The <c>Object</c> to be printed</param>
         <summary>Prints an object.</summary>
         <remarks>
           <para>
@@ -1051,7 +1052,7 @@
         <Parameter Name="b" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="b">The &lt;code&gt;boolean&lt;/code&gt; to be printed</param>
+        <param name="b">The <c>boolean</c> to be printed</param>
         <summary>Prints a boolean value.</summary>
         <remarks>
           <para>
@@ -1091,7 +1092,7 @@
         <Parameter Name="c" Type="System.Char" />
       </Parameters>
       <Docs>
-        <param name="c">The &lt;code&gt;char&lt;/code&gt; to be printed</param>
+        <param name="c">The <c>char</c> to be printed</param>
         <summary>Prints a character.</summary>
         <remarks>
           <para>
@@ -1171,7 +1172,7 @@
         <Parameter Name="d" Type="System.Double" />
       </Parameters>
       <Docs>
-        <param name="d">The &lt;code&gt;double&lt;/code&gt; to be printed</param>
+        <param name="d">The <c>double</c> to be printed</param>
         <summary>Prints a double-precision floating-point number.</summary>
         <remarks>
           <para>
@@ -1211,7 +1212,7 @@
         <Parameter Name="i" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="i">The &lt;code&gt;int&lt;/code&gt; to be printed</param>
+        <param name="i">The <c>int</c> to be printed</param>
         <summary>Prints an integer.</summary>
         <remarks>
           <para>
@@ -1251,7 +1252,7 @@
         <Parameter Name="l" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="l">The &lt;code&gt;long&lt;/code&gt; to be printed</param>
+        <param name="l">The <c>long</c> to be printed</param>
         <summary>Prints a long integer.</summary>
         <remarks>
           <para>
@@ -1291,7 +1292,7 @@
         <Parameter Name="f" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="f">The &lt;code&gt;float&lt;/code&gt; to be printed</param>
+        <param name="f">The <c>float</c> to be printed</param>
         <summary>Prints a floating-point number.</summary>
         <remarks>
           <para>
@@ -1331,7 +1332,7 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">The &lt;code&gt;String&lt;/code&gt; to be printed</param>
+        <param name="s">The <c>String</c> to be printed</param>
         <summary>Prints a string.</summary>
         <remarks>
           <para>
@@ -1823,7 +1824,7 @@
         <Parameter Name="x" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="x">The &lt;code&gt;Object&lt;/code&gt; to be printed.</param>
+        <param name="x">The <c>Object</c> to be printed.</param>
         <summary>Prints an Object and then terminate the line.</summary>
         <remarks>
           <para>
@@ -1863,7 +1864,7 @@
         <Parameter Name="x" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="x">The &lt;code&gt;boolean&lt;/code&gt; to be printed</param>
+        <param name="x">The <c>boolean</c> to be printed</param>
         <summary>Prints a boolean and then terminate the line.</summary>
         <remarks>
           <para>
@@ -1903,7 +1904,7 @@
         <Parameter Name="x" Type="System.Char" />
       </Parameters>
       <Docs>
-        <param name="x">The &lt;code&gt;char&lt;/code&gt; to be printed.</param>
+        <param name="x">The <c>char</c> to be printed.</param>
         <summary>Prints a character and then terminate the line.</summary>
         <remarks>
           <para>
@@ -1983,7 +1984,7 @@
         <Parameter Name="x" Type="System.Double" />
       </Parameters>
       <Docs>
-        <param name="x">The &lt;code&gt;double&lt;/code&gt; to be printed.</param>
+        <param name="x">The <c>double</c> to be printed.</param>
         <summary>Prints a double and then terminate the line.</summary>
         <remarks>
           <para>
@@ -2023,7 +2024,7 @@
         <Parameter Name="x" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="x">The &lt;code&gt;int&lt;/code&gt; to be printed.</param>
+        <param name="x">The <c>int</c> to be printed.</param>
         <summary>Prints an integer and then terminate the line.</summary>
         <remarks>
           <para>
@@ -2063,7 +2064,7 @@
         <Parameter Name="x" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="x">a The &lt;code&gt;long&lt;/code&gt; to be printed.</param>
+        <param name="x">a The <c>long</c> to be printed.</param>
         <summary>Prints a long and then terminate the line.</summary>
         <remarks>
           <para>
@@ -2103,7 +2104,7 @@
         <Parameter Name="x" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="x">The &lt;code&gt;float&lt;/code&gt; to be printed.</param>
+        <param name="x">The <c>float</c> to be printed.</param>
         <summary>Prints a float and then terminate the line.</summary>
         <remarks>
           <para>
@@ -2143,7 +2144,7 @@
         <Parameter Name="x" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="x">The &lt;code&gt;String&lt;/code&gt; to be printed.</param>
+        <param name="x">The <c>String</c> to be printed.</param>
         <summary>Prints a String and then terminate the line.</summary>
         <remarks>
           <para>
@@ -2428,7 +2429,7 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Sets the error state of the stream to &lt;code&gt;true&lt;/code&gt;.</summary>
+        <summary>Sets the error state of the stream to <c>true</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.IO/PrintWriter.xml b/docs/Mono.Android/en/Java.IO/PrintWriter.xml
index afc0aa0dd8..015c093790 100644
--- a/docs/Mono.Android/en/Java.IO/PrintWriter.xml
+++ b/docs/Mono.Android/en/Java.IO/PrintWriter.xml
@@ -426,7 +426,8 @@
       <Parameters />
       <Docs>
         <summary>Flushes the stream if it's not closed and checks its error state.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if the print stream has encountered an error,
+        <returns>
+          <c>true</c> if the print stream has encountered an error,
                      either on the underlying output stream or during a format
                      conversion.</returns>
         <remarks>
@@ -799,7 +800,7 @@
       </ReturnValue>
       <Docs>
         <summary>The underlying character-output stream of this
-            &lt;code&gt;PrintWriter&lt;/code&gt;.</summary>
+            <c>PrintWriter</c>.</summary>
         <value>To be added.</value>
         <remarks>
           <para>
@@ -839,7 +840,7 @@
         <Parameter Name="obj" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="obj">The &lt;code&gt;Object&lt;/code&gt; to be printed</param>
+        <param name="obj">The <c>Object</c> to be printed</param>
         <summary>Prints an object.</summary>
         <remarks>
           <para>
@@ -880,7 +881,7 @@
         <Parameter Name="b" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="b">The &lt;code&gt;boolean&lt;/code&gt; to be printed</param>
+        <param name="b">The <c>boolean</c> to be printed</param>
         <summary>Prints a boolean value.</summary>
         <remarks>
           <para>
@@ -921,7 +922,7 @@
         <Parameter Name="c" Type="System.Char" />
       </Parameters>
       <Docs>
-        <param name="c">The &lt;code&gt;char&lt;/code&gt; to be printed</param>
+        <param name="c">The <c>char</c> to be printed</param>
         <summary>Prints a character.</summary>
         <remarks>
           <para>
@@ -1003,7 +1004,7 @@
         <Parameter Name="d" Type="System.Double" />
       </Parameters>
       <Docs>
-        <param name="d">The &lt;code&gt;double&lt;/code&gt; to be printed</param>
+        <param name="d">The <c>double</c> to be printed</param>
         <summary>Prints a double-precision floating-point number.</summary>
         <remarks>
           <para>
@@ -1044,7 +1045,7 @@
         <Parameter Name="i" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="i">The &lt;code&gt;int&lt;/code&gt; to be printed</param>
+        <param name="i">The <c>int</c> to be printed</param>
         <summary>Prints an integer.</summary>
         <remarks>
           <para>
@@ -1085,7 +1086,7 @@
         <Parameter Name="l" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="l">The &lt;code&gt;long&lt;/code&gt; to be printed</param>
+        <param name="l">The <c>long</c> to be printed</param>
         <summary>Prints a long integer.</summary>
         <remarks>
           <para>
@@ -1126,7 +1127,7 @@
         <Parameter Name="f" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="f">The &lt;code&gt;float&lt;/code&gt; to be printed</param>
+        <param name="f">The <c>float</c> to be printed</param>
         <summary>Prints a floating-point number.</summary>
         <remarks>
           <para>
@@ -1167,7 +1168,7 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">The &lt;code&gt;String&lt;/code&gt; to be printed</param>
+        <param name="s">The <c>String</c> to be printed</param>
         <summary>Prints a string.</summary>
         <remarks>
           <para>
@@ -1659,7 +1660,7 @@
         <Parameter Name="x" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="x">The &lt;code&gt;Object&lt;/code&gt; to be printed.</param>
+        <param name="x">The <c>Object</c> to be printed.</param>
         <summary>Prints an Object and then terminates the line.</summary>
         <remarks>
           <para>
@@ -1699,7 +1700,7 @@
         <Parameter Name="x" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="x">the &lt;code&gt;boolean&lt;/code&gt; value to be printed</param>
+        <param name="x">the <c>boolean</c> value to be printed</param>
         <summary>Prints a boolean value and then terminates the line.</summary>
         <remarks>
           <para>
@@ -1739,7 +1740,7 @@
         <Parameter Name="x" Type="System.Char" />
       </Parameters>
       <Docs>
-        <param name="x">the &lt;code&gt;char&lt;/code&gt; value to be printed</param>
+        <param name="x">the <c>char</c> value to be printed</param>
         <summary>Prints a character and then terminates the line.</summary>
         <remarks>
           <para>
@@ -1779,7 +1780,7 @@
         <Parameter Name="x" Type="System.Char[]" />
       </Parameters>
       <Docs>
-        <param name="x">the array of &lt;code&gt;char&lt;/code&gt; values to be printed</param>
+        <param name="x">the array of <c>char</c> values to be printed</param>
         <summary>Prints an array of characters and then terminates the line.</summary>
         <remarks>
           <para>
@@ -1819,7 +1820,7 @@
         <Parameter Name="x" Type="System.Double" />
       </Parameters>
       <Docs>
-        <param name="x">the &lt;code&gt;double&lt;/code&gt; value to be printed</param>
+        <param name="x">the <c>double</c> value to be printed</param>
         <summary>Prints a double-precision floating-point number and then terminates the
             line.</summary>
         <remarks>
@@ -1860,7 +1861,7 @@
         <Parameter Name="x" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="x">the &lt;code&gt;int&lt;/code&gt; value to be printed</param>
+        <param name="x">the <c>int</c> value to be printed</param>
         <summary>Prints an integer and then terminates the line.</summary>
         <remarks>
           <para>
@@ -1900,7 +1901,7 @@
         <Parameter Name="x" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="x">the &lt;code&gt;long&lt;/code&gt; value to be printed</param>
+        <param name="x">the <c>long</c> value to be printed</param>
         <summary>Prints a long integer and then terminates the line.</summary>
         <remarks>
           <para>
@@ -1940,7 +1941,7 @@
         <Parameter Name="x" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="x">the &lt;code&gt;float&lt;/code&gt; value to be printed</param>
+        <param name="x">the <c>float</c> value to be printed</param>
         <summary>Prints a floating-point number and then terminates the line.</summary>
         <remarks>
           <para>
@@ -1980,7 +1981,7 @@
         <Parameter Name="x" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="x">the &lt;code&gt;String&lt;/code&gt; value to be printed</param>
+        <param name="x">the <c>String</c> value to be printed</param>
         <summary>Prints a String and then terminates the line.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/PushbackInputStream.xml b/docs/Mono.Android/en/Java.IO/PushbackInputStream.xml
index c4ba2325d4..9f78bc8517 100644
--- a/docs/Mono.Android/en/Java.IO/PushbackInputStream.xml
+++ b/docs/Mono.Android/en/Java.IO/PushbackInputStream.xml
@@ -18,7 +18,7 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>A &lt;code&gt;PushbackInputStream&lt;/code&gt; adds
+    <summary>A <c>PushbackInputStream</c> adds
             functionality to another input stream, namely
             the  ability to "push back" or "unread"
             one byte.</summary>
@@ -58,9 +58,9 @@
       </Parameters>
       <Docs>
         <param name="in">the input stream from which bytes will be read.</param>
-        <summary>Creates a &lt;code&gt;PushbackInputStream&lt;/code&gt;
+        <summary>Creates a <c>PushbackInputStream</c>
             and saves its  argument, the input stream
-            &lt;code&gt;in&lt;/code&gt;, for later use.</summary>
+            <c>in</c>, for later use.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -122,10 +122,10 @@
       <Docs>
         <param name="in">the input stream from which bytes will be read.</param>
         <param name="size">the size of the pushback buffer.</param>
-        <summary>Creates a &lt;code&gt;PushbackInputStream&lt;/code&gt;
-            with a pushback buffer of the specified &lt;code&gt;size&lt;/code&gt;,
+        <summary>Creates a <c>PushbackInputStream</c>
+            with a pushback buffer of the specified <c>size</c>,
             and saves its  argument, the input stream
-            &lt;code&gt;in&lt;/code&gt;, for later use.</summary>
+            <c>in</c>, for later use.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -378,7 +378,7 @@
         <Parameter Name="b" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="b">the &lt;code&gt;int&lt;/code&gt; value whose low-order
+        <param name="b">the <c>int</c> value whose low-order
                              byte is to be pushed back.</param>
         <summary>Pushes back a byte by copying it to the front of the pushback buffer.</summary>
         <remarks>
diff --git a/docs/Mono.Android/en/Java.IO/SequenceInputStream.xml b/docs/Mono.Android/en/Java.IO/SequenceInputStream.xml
index f017308a78..4d72f377ab 100644
--- a/docs/Mono.Android/en/Java.IO/SequenceInputStream.xml
+++ b/docs/Mono.Android/en/Java.IO/SequenceInputStream.xml
@@ -18,7 +18,7 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>A &lt;code&gt;SequenceInputStream&lt;/code&gt; represents
+    <summary>A <c>SequenceInputStream</c> represents
             the logical concatenation of other input
             streams.</summary>
     <remarks>
@@ -57,10 +57,10 @@
       </Parameters>
       <Docs>
         <param name="e">an enumeration of input streams.</param>
-        <summary>Initializes a newly created &lt;code&gt;SequenceInputStream&lt;/code&gt;
+        <summary>Initializes a newly created <c>SequenceInputStream</c>
             by remembering the argument, which must
-            be an &lt;code&gt;Enumeration&lt;/code&gt;  that produces
-            objects whose run-time type is &lt;code&gt;InputStream&lt;/code&gt;.</summary>
+            be an <c>Enumeration</c>  that produces
+            objects whose run-time type is <c>InputStream</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -122,11 +122,11 @@
         <param name="s1">the first input stream to read.</param>
         <param name="s2">the second input stream to read.</param>
         <summary>Initializes a newly
-            created &lt;code&gt;SequenceInputStream&lt;/code&gt;
+            created <c>SequenceInputStream</c>
             by remembering the two arguments, which
-            will be read in order, first &lt;code&gt;s1&lt;/code&gt;
-            and then &lt;code&gt;s2&lt;/code&gt;, to provide the
-            bytes to be read from this &lt;code&gt;SequenceInputStream&lt;/code&gt;.</summary>
+            will be read in order, first <c>s1</c>
+            and then <c>s2</c>, to provide the
+            bytes to be read from this <c>SequenceInputStream</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -197,7 +197,7 @@
       <Parameters />
       <Docs>
         <summary>Reads the next byte of data from this input stream.</summary>
-        <returns>the next byte of data, or &lt;code&gt;-1&lt;/code&gt; if the end of the
+        <returns>the next byte of data, or <c>-1</c> if the end of the
                         stream is reached.</returns>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/StreamTokenizer.xml b/docs/Mono.Android/en/Java.IO/StreamTokenizer.xml
index 26a6568ab8..4b83ffac6f 100644
--- a/docs/Mono.Android/en/Java.IO/StreamTokenizer.xml
+++ b/docs/Mono.Android/en/Java.IO/StreamTokenizer.xml
@@ -486,7 +486,7 @@
         <param name="low">the low end of the range.</param>
         <param name="hi">the high end of the range.</param>
         <summary>Specifies that all characters <i>c</i> in the range
-            &lt;code&gt;low&amp;nbsp;&amp;lt;=&amp;nbsp;<i>c</i>&amp;nbsp;&amp;lt;=&amp;nbsp;high&lt;/code&gt;
+            <c>low&amp;nbsp;&amp;lt;=&amp;nbsp;<i>c</i>&amp;nbsp;&amp;lt;=&amp;nbsp;high</c>
             are "ordinary" in this tokenizer.</summary>
         <remarks>
           <para>
@@ -1072,7 +1072,7 @@
         <param name="low">the low end of the range.</param>
         <param name="hi">the high end of the range.</param>
         <summary>Specifies that all characters <i>c</i> in the range
-            &lt;code&gt;low&amp;nbsp;&amp;lt;=&amp;nbsp;<i>c</i>&amp;nbsp;&amp;lt;=&amp;nbsp;high&lt;/code&gt;
+            <c>low&amp;nbsp;&amp;lt;=&amp;nbsp;<i>c</i>&amp;nbsp;&amp;lt;=&amp;nbsp;high</c>
             are white space characters.</summary>
         <remarks>
           <para>
@@ -1116,7 +1116,7 @@
         <param name="low">the low end of the range.</param>
         <param name="hi">the high end of the range.</param>
         <summary>Specifies that all characters <i>c</i> in the range
-            &lt;code&gt;low&amp;nbsp;&amp;lt;=&amp;nbsp;<i>c</i>&amp;nbsp;&amp;lt;=&amp;nbsp;high&lt;/code&gt;
+            <c>low&amp;nbsp;&amp;lt;=&amp;nbsp;<i>c</i>&amp;nbsp;&amp;lt;=&amp;nbsp;high</c>
             are word constituents.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/StringBufferInputStream.xml b/docs/Mono.Android/en/Java.IO/StringBufferInputStream.xml
index b64831453c..49be0c461b 100644
--- a/docs/Mono.Android/en/Java.IO/StringBufferInputStream.xml
+++ b/docs/Mono.Android/en/Java.IO/StringBufferInputStream.xml
@@ -285,7 +285,7 @@
       <Parameters />
       <Docs>
         <summary>Reads the next byte of data from this input stream.</summary>
-        <returns>the next byte of data, or &lt;code&gt;-1&lt;/code&gt; if the end of the
+        <returns>the next byte of data, or <c>-1</c> if the end of the
                         stream is reached.</returns>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/UTFDataFormatException.xml b/docs/Mono.Android/en/Java.IO/UTFDataFormatException.xml
index f02923fc66..3d04f50cec 100644
--- a/docs/Mono.Android/en/Java.IO/UTFDataFormatException.xml
+++ b/docs/Mono.Android/en/Java.IO/UTFDataFormatException.xml
@@ -52,8 +52,8 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <summary>Constructs a &lt;code&gt;UTFDataFormatException&lt;/code&gt; with
-            &lt;code&gt;null&lt;/code&gt; as its error detail message.</summary>
+        <summary>Constructs a <c>UTFDataFormatException</c> with
+            <c>null</c> as its error detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -90,7 +90,7 @@
       </Parameters>
       <Docs>
         <param name="s">the detail message.</param>
-        <summary>Constructs a &lt;code&gt;UTFDataFormatException&lt;/code&gt; with the
+        <summary>Constructs a <c>UTFDataFormatException</c> with the
             specified detail message.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang.Ref/Reference.xml b/docs/Mono.Android/en/Java.Lang.Ref/Reference.xml
index 7bf48d38c0..b16349ec61 100644
--- a/docs/Mono.Android/en/Java.Lang.Ref/Reference.xml
+++ b/docs/Mono.Android/en/Java.Lang.Ref/Reference.xml
@@ -121,8 +121,9 @@
       <Docs>
         <summary>Adds this reference object to the queue with which it is registered,
             if any.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if this reference object was successfully
-                      enqueued; &lt;code&gt;false&lt;/code&gt; if it was already enqueued or if
+        <returns>
+          <c>true</c> if this reference object was successfully
+                      enqueued; <c>false</c> if it was already enqueued or if
                       it was not registered with a queue when it was created</returns>
         <remarks>
           <para>
@@ -162,7 +163,7 @@
       <Docs>
         <summary>Returns this reference object's referent.</summary>
         <returns>The object to which this reference refers, or
-                      &lt;code&gt;null&lt;/code&gt; if this reference object has been cleared</returns>
+                      <c>null</c> if this reference object has been cleared</returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.Lang.Ref/ReferenceQueue.xml b/docs/Mono.Android/en/Java.Lang.Ref/ReferenceQueue.xml
index 7b473237c0..cd69999c2c 100644
--- a/docs/Mono.Android/en/Java.Lang.Ref/ReferenceQueue.xml
+++ b/docs/Mono.Android/en/Java.Lang.Ref/ReferenceQueue.xml
@@ -149,7 +149,7 @@
       <Docs>
         <summary>Polls this queue to see if a reference object is available.</summary>
         <returns>A reference object, if one was immediately available,
-                     otherwise &lt;code&gt;null&lt;/code&gt;</returns>
+                     otherwise <c>null</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -229,13 +229,13 @@
         <Parameter Name="timeout" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="timeout">If positive, block for up to &lt;code&gt;timeout&lt;/code&gt;
+        <param name="timeout">If positive, block for up to <c>timeout</c>
                              milliseconds while waiting for a reference to be
                              added to this queue.  If zero, block indefinitely.</param>
         <summary>Removes the next reference object in this queue, blocking until either
             one becomes available or the given timeout period expires.</summary>
         <returns>A reference object, if one was available within the specified
-                     timeout period, otherwise &lt;code&gt;null&lt;/code&gt;</returns>
+                     timeout period, otherwise <c>null</c></returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.Lang/AbstractMethodError.xml b/docs/Mono.Android/en/Java.Lang/AbstractMethodError.xml
index d0fb9b1573..75a935e487 100644
--- a/docs/Mono.Android/en/Java.Lang/AbstractMethodError.xml
+++ b/docs/Mono.Android/en/Java.Lang/AbstractMethodError.xml
@@ -51,7 +51,7 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <summary>Constructs an &lt;code&gt;AbstractMethodError&lt;/code&gt; with no detail  message.</summary>
+        <summary>Constructs an <c>AbstractMethodError</c> with no detail  message.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -88,7 +88,7 @@
       </Parameters>
       <Docs>
         <param name="s">the detail message.</param>
-        <summary>Constructs an &lt;code&gt;AbstractMethodError&lt;/code&gt; with the specified
+        <summary>Constructs an <c>AbstractMethodError</c> with the specified
             detail message.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/ArrayIndexOutOfBoundsException.xml b/docs/Mono.Android/en/Java.Lang/ArrayIndexOutOfBoundsException.xml
index 41b1c6985e..7f1a610554 100644
--- a/docs/Mono.Android/en/Java.Lang/ArrayIndexOutOfBoundsException.xml
+++ b/docs/Mono.Android/en/Java.Lang/ArrayIndexOutOfBoundsException.xml
@@ -52,7 +52,7 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <summary>Constructs an &lt;code&gt;ArrayIndexOutOfBoundsException&lt;/code&gt; with no
+        <summary>Constructs an <c>ArrayIndexOutOfBoundsException</c> with no
             detail message.</summary>
         <remarks>
           <para>
@@ -90,7 +90,7 @@
       </Parameters>
       <Docs>
         <param name="index">the illegal index.</param>
-        <summary>Constructs a new &lt;code&gt;ArrayIndexOutOfBoundsException&lt;/code&gt;
+        <summary>Constructs a new <c>ArrayIndexOutOfBoundsException</c>
             class with an argument indicating the illegal index.</summary>
         <remarks>
           <para>
@@ -128,7 +128,7 @@
       </Parameters>
       <Docs>
         <param name="s">the detail message.</param>
-        <summary>Constructs an &lt;code&gt;ArrayIndexOutOfBoundsException&lt;/code&gt; class
+        <summary>Constructs an <c>ArrayIndexOutOfBoundsException</c> class
             with the specified detail message.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/ArrayStoreException.xml b/docs/Mono.Android/en/Java.Lang/ArrayStoreException.xml
index ff13b6df00..3053392881 100644
--- a/docs/Mono.Android/en/Java.Lang/ArrayStoreException.xml
+++ b/docs/Mono.Android/en/Java.Lang/ArrayStoreException.xml
@@ -52,7 +52,7 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <summary>Constructs an &lt;code&gt;ArrayStoreException&lt;/code&gt; with no detail message.</summary>
+        <summary>Constructs an <c>ArrayStoreException</c> with no detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -89,7 +89,7 @@
       </Parameters>
       <Docs>
         <param name="s">the detail message.</param>
-        <summary>Constructs an &lt;code&gt;ArrayStoreException&lt;/code&gt; with the specified
+        <summary>Constructs an <c>ArrayStoreException</c> with the specified
             detail message.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/AssertionError.xml b/docs/Mono.Android/en/Java.Lang/AssertionError.xml
index 157f39f94d..9b0b66cce6 100644
--- a/docs/Mono.Android/en/Java.Lang/AssertionError.xml
+++ b/docs/Mono.Android/en/Java.Lang/AssertionError.xml
@@ -128,7 +128,7 @@
       <Docs>
         <param name="detailMessage">value to be used in constructing detail message</param>
         <summary>Constructs an AssertionError with its detail message derived
-            from the specified &lt;code&gt;boolean&lt;/code&gt;, which is converted to
+            from the specified <c>boolean</c>, which is converted to
             a string as defined in section 15.</summary>
         <remarks>
           <para>
@@ -167,7 +167,7 @@
       <Docs>
         <param name="detailMessage">value to be used in constructing detail message</param>
         <summary>Constructs an AssertionError with its detail message derived
-            from the specified &lt;code&gt;char&lt;/code&gt;, which is converted to a
+            from the specified <c>char</c>, which is converted to a
             string as defined in section 15.</summary>
         <remarks>
           <para>
@@ -206,7 +206,7 @@
       <Docs>
         <param name="detailMessage">value to be used in constructing detail message</param>
         <summary>Constructs an AssertionError with its detail message derived
-            from the specified &lt;code&gt;double&lt;/code&gt;, which is converted to a
+            from the specified <c>double</c>, which is converted to a
             string as defined in section 15.</summary>
         <remarks>
           <para>
@@ -245,7 +245,7 @@
       <Docs>
         <param name="detailMessage">value to be used in constructing detail message</param>
         <summary>Constructs an AssertionError with its detail message derived
-            from the specified &lt;code&gt;int&lt;/code&gt;, which is converted to a
+            from the specified <c>int</c>, which is converted to a
             string as defined in section 15.</summary>
         <remarks>
           <para>
@@ -284,7 +284,7 @@
       <Docs>
         <param name="detailMessage">value to be used in constructing detail message</param>
         <summary>Constructs an AssertionError with its detail message derived
-            from the specified &lt;code&gt;long&lt;/code&gt;, which is converted to a
+            from the specified <c>long</c>, which is converted to a
             string as defined in section 15.</summary>
         <remarks>
           <para>
@@ -323,7 +323,7 @@
       <Docs>
         <param name="detailMessage">value to be used in constructing detail message</param>
         <summary>Constructs an AssertionError with its detail message derived
-            from the specified &lt;code&gt;float&lt;/code&gt;, which is converted to a
+            from the specified <c>float</c>, which is converted to a
             string as defined in section 15.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/Character.xml b/docs/Mono.Android/en/Java.Lang/Character.xml
index ec356aabbf..a0461b6aac 100644
--- a/docs/Mono.Android/en/Java.Lang/Character.xml
+++ b/docs/Mono.Android/en/Java.Lang/Character.xml
@@ -2523,8 +2523,9 @@
       <Docs>
         <param name="codePoint">the character (Unicode code point) to be tested.</param>
         <summary>Determines if the specified character (Unicode code point) is an alphabet.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if the character is a Unicode alphabet
-                     character, &lt;code&gt;false&lt;/code&gt; otherwise.</returns>
+        <returns>
+          <c>true</c> if the character is a Unicode alphabet
+                     character, <c>false</c> otherwise.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -2921,8 +2922,9 @@
         <summary>Determines if the specified character (Unicode code point) is a CJKV
             (Chinese, Japanese, Korean and Vietnamese) ideograph, as defined by
             the Unicode Standard.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if the character is a Unicode ideograph
-                     character, &lt;code&gt;false&lt;/code&gt; otherwise.</returns>
+        <returns>
+          <c>true</c> if the character is a Unicode ideograph
+                     character, <c>false</c> otherwise.</returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.Lang/ClassCastException.xml b/docs/Mono.Android/en/Java.Lang/ClassCastException.xml
index c0191e38c6..6c42905107 100644
--- a/docs/Mono.Android/en/Java.Lang/ClassCastException.xml
+++ b/docs/Mono.Android/en/Java.Lang/ClassCastException.xml
@@ -52,7 +52,7 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <summary>Constructs a &lt;code&gt;ClassCastException&lt;/code&gt; with no detail message.</summary>
+        <summary>Constructs a <c>ClassCastException</c> with no detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -89,7 +89,7 @@
       </Parameters>
       <Docs>
         <param name="s">the detail message.</param>
-        <summary>Constructs a &lt;code&gt;ClassCastException&lt;/code&gt; with the specified
+        <summary>Constructs a <c>ClassCastException</c> with the specified
             detail message.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/ClassFormatError.xml b/docs/Mono.Android/en/Java.Lang/ClassFormatError.xml
index ad1207a1b6..5429778f5c 100644
--- a/docs/Mono.Android/en/Java.Lang/ClassFormatError.xml
+++ b/docs/Mono.Android/en/Java.Lang/ClassFormatError.xml
@@ -53,7 +53,7 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <summary>Constructs a &lt;code&gt;ClassFormatError&lt;/code&gt; with no detail message.</summary>
+        <summary>Constructs a <c>ClassFormatError</c> with no detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -90,7 +90,7 @@
       </Parameters>
       <Docs>
         <param name="s">the detail message.</param>
-        <summary>Constructs a &lt;code&gt;ClassFormatError&lt;/code&gt; with the specified
+        <summary>Constructs a <c>ClassFormatError</c> with the specified
             detail message.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/ClassNotFoundException.xml b/docs/Mono.Android/en/Java.Lang/ClassNotFoundException.xml
index b72b74d587..4413fbcc63 100644
--- a/docs/Mono.Android/en/Java.Lang/ClassNotFoundException.xml
+++ b/docs/Mono.Android/en/Java.Lang/ClassNotFoundException.xml
@@ -21,7 +21,7 @@
     <summary>Thrown when an application tries to load in a class through its
             string name using:
             &lt;ul&gt;
-            &lt;li&gt;The &lt;code&gt;forName&lt;/code&gt; method in class &lt;code&gt;Class&lt;/code&gt;.</summary>
+            &lt;li&gt;The <c>forName</c> method in class <c>Class</c>.</summary>
     <remarks>
       <para>
         <format type="text/html">
@@ -54,7 +54,7 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <summary>Constructs a &lt;code&gt;ClassNotFoundException&lt;/code&gt; with no detail message.</summary>
+        <summary>Constructs a <c>ClassNotFoundException</c> with no detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -91,7 +91,7 @@
       </Parameters>
       <Docs>
         <param name="s">the detail message.</param>
-        <summary>Constructs a &lt;code&gt;ClassNotFoundException&lt;/code&gt; with the
+        <summary>Constructs a <c>ClassNotFoundException</c> with the
             specified detail message.</summary>
         <remarks>
           <para>
@@ -154,7 +154,7 @@
       <Docs>
         <param name="s">the detail message</param>
         <param name="ex">the exception that was raised while loading the class</param>
-        <summary>Constructs a &lt;code&gt;ClassNotFoundException&lt;/code&gt; with the
+        <summary>Constructs a <c>ClassNotFoundException</c> with the
             specified detail message and optional exception that was
             raised while loading the class.</summary>
         <remarks>
@@ -221,7 +221,7 @@
       <Docs>
         <summary>Returns the exception that was raised if an error occurred while
             attempting to load the class.</summary>
-        <value>the &lt;code&gt;Exception&lt;/code&gt; that was raised while loading a class</value>
+        <value>the <c>Exception</c> that was raised while loading a class</value>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.Lang/CloneNotSupportedException.xml b/docs/Mono.Android/en/Java.Lang/CloneNotSupportedException.xml
index fa32e9dbad..859b40f72e 100644
--- a/docs/Mono.Android/en/Java.Lang/CloneNotSupportedException.xml
+++ b/docs/Mono.Android/en/Java.Lang/CloneNotSupportedException.xml
@@ -18,9 +18,9 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>Thrown to indicate that the &lt;code&gt;clone&lt;/code&gt; method in class
-            &lt;code&gt;Object&lt;/code&gt; has been called to clone an object, but that
-            the object's class does not implement the &lt;code&gt;Cloneable&lt;/code&gt;
+    <summary>Thrown to indicate that the <c>clone</c> method in class
+            <c>Object</c> has been called to clone an object, but that
+            the object's class does not implement the <c>Cloneable</c>
             interface.</summary>
     <remarks>
       <para>
@@ -54,7 +54,7 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <summary>Constructs a &lt;code&gt;CloneNotSupportedException&lt;/code&gt; with no
+        <summary>Constructs a <c>CloneNotSupportedException</c> with no
             detail message.</summary>
         <remarks>
           <para>
@@ -92,7 +92,7 @@
       </Parameters>
       <Docs>
         <param name="s">the detail message.</param>
-        <summary>Constructs a &lt;code&gt;CloneNotSupportedException&lt;/code&gt; with the
+        <summary>Constructs a <c>CloneNotSupportedException</c> with the
             specified detail message.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/ExceptionInInitializerError.xml b/docs/Mono.Android/en/Java.Lang/ExceptionInInitializerError.xml
index c82e426b96..5a121773c6 100644
--- a/docs/Mono.Android/en/Java.Lang/ExceptionInInitializerError.xml
+++ b/docs/Mono.Android/en/Java.Lang/ExceptionInInitializerError.xml
@@ -51,8 +51,8 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <summary>Constructs an &lt;code&gt;ExceptionInInitializerError&lt;/code&gt; with
-            &lt;code&gt;null&lt;/code&gt; as its detail message string and with no saved
+        <summary>Constructs an <c>ExceptionInInitializerError</c> with
+            <c>null</c> as its detail message string and with no saved
             throwable object.</summary>
         <remarks>
           <para>
@@ -90,8 +90,8 @@
       </Parameters>
       <Docs>
         <param name="thrown">The exception thrown</param>
-        <summary>Constructs a new &lt;code&gt;ExceptionInInitializerError&lt;/code&gt; class by
-            saving a reference to the &lt;code&gt;Throwable&lt;/code&gt; object thrown for
+        <summary>Constructs a new <c>ExceptionInInitializerError</c> class by
+            saving a reference to the <c>Throwable</c> object thrown for
             later retrieval by the <c>#getException()</c> method.</summary>
         <remarks>
           <para>
@@ -192,8 +192,8 @@
         <summary>Returns the exception that occurred during a static initialization that
             caused this error to be created.</summary>
         <value>the saved throwable object of this
-                    &lt;code&gt;ExceptionInInitializerError&lt;/code&gt;, or &lt;code&gt;null&lt;/code&gt;
-                    if this &lt;code&gt;ExceptionInInitializerError&lt;/code&gt; has no saved
+                    <c>ExceptionInInitializerError</c>, or <c>null</c>
+                    if this <c>ExceptionInInitializerError</c> has no saved
                     throwable object.</value>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/ICharSequence.xml b/docs/Mono.Android/en/Java.Lang/ICharSequence.xml
index 0f2b5ce10e..dae648c46a 100644
--- a/docs/Mono.Android/en/Java.Lang/ICharSequence.xml
+++ b/docs/Mono.Android/en/Java.Lang/ICharSequence.xml
@@ -31,7 +31,7 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>A <c>CharSequence</c> is a readable sequence of &lt;code&gt;char&lt;/code&gt; values.</summary>
+    <summary>A <c>CharSequence</c> is a readable sequence of <c>char</c> values.</summary>
     <remarks>
       <para>
         <format type="text/html">
@@ -70,9 +70,9 @@
         <Parameter Name="index" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="index">the index of the &lt;code&gt;char&lt;/code&gt; value to be returned</param>
-        <summary>Returns the &lt;code&gt;char&lt;/code&gt; value at the specified index.</summary>
-        <returns>the specified &lt;code&gt;char&lt;/code&gt; value</returns>
+        <param name="index">the index of the <c>char</c> value to be returned</param>
+        <summary>Returns the <c>char</c> value at the specified index.</summary>
+        <returns>the specified <c>char</c> value</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -112,7 +112,7 @@
       <Parameters />
       <Docs>
         <summary>Returns the length of this character sequence.</summary>
-        <returns>the number of &lt;code&gt;char&lt;/code&gt;s in this sequence</returns>
+        <returns>the number of <c>char</c>s in this sequence</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -154,7 +154,7 @@
       <Docs>
         <param name="start">the start index, inclusive</param>
         <param name="end">the end index, exclusive</param>
-        <summary>Returns a &lt;code&gt;CharSequence&lt;/code&gt; that is a subsequence of this sequence.</summary>
+        <summary>Returns a <c>CharSequence</c> that is a subsequence of this sequence.</summary>
         <returns>the specified subsequence</returns>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/ICloneable.xml b/docs/Mono.Android/en/Java.Lang/ICloneable.xml
index db2758d64e..d06f263caa 100644
--- a/docs/Mono.Android/en/Java.Lang/ICloneable.xml
+++ b/docs/Mono.Android/en/Java.Lang/ICloneable.xml
@@ -25,7 +25,7 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>A class implements the &lt;code&gt;Cloneable&lt;/code&gt; interface to
+    <summary>A class implements the <c>Cloneable</c> interface to
             indicate to the <c>java.lang.Object#clone()</c> method that it
             is legal for that method to make a
             field-for-field copy of instances of that class.</summary>
diff --git a/docs/Mono.Android/en/Java.Lang/IRunnable.xml b/docs/Mono.Android/en/Java.Lang/IRunnable.xml
index d3022fd40f..e3d8db4cb4 100644
--- a/docs/Mono.Android/en/Java.Lang/IRunnable.xml
+++ b/docs/Mono.Android/en/Java.Lang/IRunnable.xml
@@ -25,7 +25,7 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>The &lt;code&gt;Runnable&lt;/code&gt; interface should be implemented by any
+    <summary>The <c>Runnable</c> interface should be implemented by any
             class whose instances are intended to be executed by a thread.</summary>
     <remarks>
       <para>
@@ -63,9 +63,9 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>When an object implementing interface &lt;code&gt;Runnable&lt;/code&gt; is used
+        <summary>When an object implementing interface <c>Runnable</c> is used
             to create a thread, starting the thread causes the object's
-            &lt;code&gt;run&lt;/code&gt; method to be called in that separately executing
+            <c>run</c> method to be called in that separately executing
             thread.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/IllegalAccessError.xml b/docs/Mono.Android/en/Java.Lang/IllegalAccessError.xml
index 4a0e5c2fbc..2772fbd8db 100644
--- a/docs/Mono.Android/en/Java.Lang/IllegalAccessError.xml
+++ b/docs/Mono.Android/en/Java.Lang/IllegalAccessError.xml
@@ -52,7 +52,7 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <summary>Constructs an &lt;code&gt;IllegalAccessError&lt;/code&gt; with no detail message.</summary>
+        <summary>Constructs an <c>IllegalAccessError</c> with no detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -89,7 +89,7 @@
       </Parameters>
       <Docs>
         <param name="s">the detail message.</param>
-        <summary>Constructs an &lt;code&gt;IllegalAccessError&lt;/code&gt; with the specified
+        <summary>Constructs an <c>IllegalAccessError</c> with the specified
             detail message.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/IllegalAccessException.xml b/docs/Mono.Android/en/Java.Lang/IllegalAccessException.xml
index f138879e46..5922280047 100644
--- a/docs/Mono.Android/en/Java.Lang/IllegalAccessException.xml
+++ b/docs/Mono.Android/en/Java.Lang/IllegalAccessException.xml
@@ -55,7 +55,7 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <summary>Constructs an &lt;code&gt;IllegalAccessException&lt;/code&gt; without a
+        <summary>Constructs an <c>IllegalAccessException</c> without a
             detail message.</summary>
         <remarks>
           <para>
@@ -93,7 +93,7 @@
       </Parameters>
       <Docs>
         <param name="s">the detail message.</param>
-        <summary>Constructs an &lt;code&gt;IllegalAccessException&lt;/code&gt; with a detail message.</summary>
+        <summary>Constructs an <c>IllegalAccessException</c> with a detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.Lang/IllegalArgumentException.xml b/docs/Mono.Android/en/Java.Lang/IllegalArgumentException.xml
index 6591ba0880..0a2bf6c6d3 100644
--- a/docs/Mono.Android/en/Java.Lang/IllegalArgumentException.xml
+++ b/docs/Mono.Android/en/Java.Lang/IllegalArgumentException.xml
@@ -52,7 +52,7 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <summary>Constructs an &lt;code&gt;IllegalArgumentException&lt;/code&gt; with no
+        <summary>Constructs an <c>IllegalArgumentException</c> with no
             detail message.</summary>
         <remarks>
           <para>
@@ -132,7 +132,7 @@
       </Parameters>
       <Docs>
         <param name="s">the detail message.</param>
-        <summary>Constructs an &lt;code&gt;IllegalArgumentException&lt;/code&gt; with the
+        <summary>Constructs an <c>IllegalArgumentException</c> with the
             specified detail message.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/IllegalMonitorStateException.xml b/docs/Mono.Android/en/Java.Lang/IllegalMonitorStateException.xml
index e1627fdc2d..4018a6cb3c 100644
--- a/docs/Mono.Android/en/Java.Lang/IllegalMonitorStateException.xml
+++ b/docs/Mono.Android/en/Java.Lang/IllegalMonitorStateException.xml
@@ -53,7 +53,7 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <summary>Constructs an &lt;code&gt;IllegalMonitorStateException&lt;/code&gt; with no
+        <summary>Constructs an <c>IllegalMonitorStateException</c> with no
             detail message.</summary>
         <remarks>
           <para>
@@ -91,7 +91,7 @@
       </Parameters>
       <Docs>
         <param name="s">the detail message.</param>
-        <summary>Constructs an &lt;code&gt;IllegalMonitorStateException&lt;/code&gt; with the
+        <summary>Constructs an <c>IllegalMonitorStateException</c> with the
             specified detail message.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/IllegalThreadStateException.xml b/docs/Mono.Android/en/Java.Lang/IllegalThreadStateException.xml
index 3fcd729827..e05dd64fb8 100644
--- a/docs/Mono.Android/en/Java.Lang/IllegalThreadStateException.xml
+++ b/docs/Mono.Android/en/Java.Lang/IllegalThreadStateException.xml
@@ -52,7 +52,7 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <summary>Constructs an &lt;code&gt;IllegalThreadStateException&lt;/code&gt; with no
+        <summary>Constructs an <c>IllegalThreadStateException</c> with no
             detail message.</summary>
         <remarks>
           <para>
@@ -90,7 +90,7 @@
       </Parameters>
       <Docs>
         <param name="s">the detail message.</param>
-        <summary>Constructs an &lt;code&gt;IllegalThreadStateException&lt;/code&gt; with the
+        <summary>Constructs an <c>IllegalThreadStateException</c> with the
             specified detail message.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/IncompatibleClassChangeError.xml b/docs/Mono.Android/en/Java.Lang/IncompatibleClassChangeError.xml
index 89d8881c9c..f53e332538 100644
--- a/docs/Mono.Android/en/Java.Lang/IncompatibleClassChangeError.xml
+++ b/docs/Mono.Android/en/Java.Lang/IncompatibleClassChangeError.xml
@@ -52,7 +52,7 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <summary>Constructs an &lt;code&gt;IncompatibleClassChangeError&lt;/code&gt; with no
+        <summary>Constructs an <c>IncompatibleClassChangeError</c> with no
             detail message.</summary>
         <remarks>
           <para>
@@ -90,7 +90,7 @@
       </Parameters>
       <Docs>
         <param name="s">the detail message.</param>
-        <summary>Constructs an &lt;code&gt;IncompatibleClassChangeError&lt;/code&gt; with the
+        <summary>Constructs an <c>IncompatibleClassChangeError</c> with the
             specified detail message.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/IndexOutOfBoundsException.xml b/docs/Mono.Android/en/Java.Lang/IndexOutOfBoundsException.xml
index 5083446641..9bba8b70c7 100644
--- a/docs/Mono.Android/en/Java.Lang/IndexOutOfBoundsException.xml
+++ b/docs/Mono.Android/en/Java.Lang/IndexOutOfBoundsException.xml
@@ -52,7 +52,7 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <summary>Constructs an &lt;code&gt;IndexOutOfBoundsException&lt;/code&gt; with no
+        <summary>Constructs an <c>IndexOutOfBoundsException</c> with no
             detail message.</summary>
         <remarks>
           <para>
@@ -90,7 +90,7 @@
       </Parameters>
       <Docs>
         <param name="s">the detail message.</param>
-        <summary>Constructs an &lt;code&gt;IndexOutOfBoundsException&lt;/code&gt; with the
+        <summary>Constructs an <c>IndexOutOfBoundsException</c> with the
             specified detail message.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/InstantiationError.xml b/docs/Mono.Android/en/Java.Lang/InstantiationError.xml
index 0c126fc504..a05486e39c 100644
--- a/docs/Mono.Android/en/Java.Lang/InstantiationError.xml
+++ b/docs/Mono.Android/en/Java.Lang/InstantiationError.xml
@@ -18,7 +18,7 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>Thrown when an application tries to use the Java &lt;code&gt;new&lt;/code&gt;
+    <summary>Thrown when an application tries to use the Java <c>new</c>
             construct to instantiate an abstract class or an interface.</summary>
     <remarks>
       <para>
@@ -52,7 +52,7 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <summary>Constructs an &lt;code&gt;InstantiationError&lt;/code&gt; with no detail  message.</summary>
+        <summary>Constructs an <c>InstantiationError</c> with no detail  message.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -89,7 +89,7 @@
       </Parameters>
       <Docs>
         <param name="s">the detail message.</param>
-        <summary>Constructs an &lt;code&gt;InstantiationError&lt;/code&gt; with the specified
+        <summary>Constructs an <c>InstantiationError</c> with the specified
             detail message.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/InternalError.xml b/docs/Mono.Android/en/Java.Lang/InternalError.xml
index 351df41b3e..e6d049f16d 100644
--- a/docs/Mono.Android/en/Java.Lang/InternalError.xml
+++ b/docs/Mono.Android/en/Java.Lang/InternalError.xml
@@ -52,7 +52,7 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <summary>Constructs an &lt;code&gt;InternalError&lt;/code&gt; with no detail message.</summary>
+        <summary>Constructs an <c>InternalError</c> with no detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -131,7 +131,7 @@
       </Parameters>
       <Docs>
         <param name="message">the detail message.</param>
-        <summary>Constructs an &lt;code&gt;InternalError&lt;/code&gt; with the specified
+        <summary>Constructs an <c>InternalError</c> with the specified
             detail message.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/InterruptedException.xml b/docs/Mono.Android/en/Java.Lang/InterruptedException.xml
index 5c02f79284..22e8041bb9 100644
--- a/docs/Mono.Android/en/Java.Lang/InterruptedException.xml
+++ b/docs/Mono.Android/en/Java.Lang/InterruptedException.xml
@@ -52,7 +52,7 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <summary>Constructs an &lt;code&gt;InterruptedException&lt;/code&gt; with no detail  message.</summary>
+        <summary>Constructs an <c>InterruptedException</c> with no detail  message.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -89,7 +89,7 @@
       </Parameters>
       <Docs>
         <param name="s">the detail message.</param>
-        <summary>Constructs an &lt;code&gt;InterruptedException&lt;/code&gt; with the
+        <summary>Constructs an <c>InterruptedException</c> with the
             specified detail message.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/JavaSystem.xml b/docs/Mono.Android/en/Java.Lang/JavaSystem.xml
index 6f93ff2bba..d634dc2f68 100644
--- a/docs/Mono.Android/en/Java.Lang/JavaSystem.xml
+++ b/docs/Mono.Android/en/Java.Lang/JavaSystem.xml
@@ -18,7 +18,7 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>The &lt;code&gt;System&lt;/code&gt; class contains several useful class fields
+    <summary>The <c>System</c> class contains several useful class fields
             and methods.</summary>
     <remarks>
       <para>
@@ -110,7 +110,7 @@
         <param name="key">the name of the system property to be removed.</param>
         <summary>Removes the system property indicated by the specified key.</summary>
         <returns>the previous string value of the system property,
-                        or &lt;code&gt;null&lt;/code&gt; if there was no property with that key.</returns>
+                        or <c>null</c> if there was no property with that key.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -384,7 +384,7 @@
       <Docs>
         <param name="name">the name of the environment variable</param>
         <summary>Gets the value of the specified environment variable.</summary>
-        <returns>the string value of the variable, or &lt;code&gt;null&lt;/code&gt;
+        <returns>the string value of the variable, or <c>null</c>
                     if the variable is not defined in the system environment</returns>
         <remarks>
           <para>
@@ -427,7 +427,7 @@
         <param name="key">the name of the system property.</param>
         <summary>Gets the system property indicated by the specified key.</summary>
         <returns>the string value of the system property,
-                        or &lt;code&gt;null&lt;/code&gt; if there is no property with that key.</returns>
+                        or <c>null</c> if there is no property with that key.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -768,7 +768,7 @@
       </Parameters>
       <Docs>
         <param name="libname">the name of the library.</param>
-        <summary>Loads the native library specified by the &lt;code&gt;libname&lt;/code&gt;
+        <summary>Loads the native library specified by the <c>libname</c>
             argument.</summary>
         <remarks>
           <para>
@@ -1272,7 +1272,7 @@
         <param name="value">the value of the system property.</param>
         <summary>Sets the system property indicated by the specified key.</summary>
         <returns>the previous value of the system property,
-                        or &lt;code&gt;null&lt;/code&gt; if it did not have one.</returns>
+                        or <c>null</c> if it did not have one.</returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.Lang/NegativeArraySizeException.xml b/docs/Mono.Android/en/Java.Lang/NegativeArraySizeException.xml
index 56a647520f..b6be878a46 100644
--- a/docs/Mono.Android/en/Java.Lang/NegativeArraySizeException.xml
+++ b/docs/Mono.Android/en/Java.Lang/NegativeArraySizeException.xml
@@ -51,7 +51,7 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <summary>Constructs a &lt;code&gt;NegativeArraySizeException&lt;/code&gt; with no
+        <summary>Constructs a <c>NegativeArraySizeException</c> with no
             detail message.</summary>
         <remarks>
           <para>
@@ -89,7 +89,7 @@
       </Parameters>
       <Docs>
         <param name="s">the detail message.</param>
-        <summary>Constructs a &lt;code&gt;NegativeArraySizeException&lt;/code&gt; with the
+        <summary>Constructs a <c>NegativeArraySizeException</c> with the
             specified detail message.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/NoClassDefFoundError.xml b/docs/Mono.Android/en/Java.Lang/NoClassDefFoundError.xml
index ba2dffb478..ddd5872d1d 100644
--- a/docs/Mono.Android/en/Java.Lang/NoClassDefFoundError.xml
+++ b/docs/Mono.Android/en/Java.Lang/NoClassDefFoundError.xml
@@ -18,9 +18,9 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>Thrown if the Java Virtual Machine or a &lt;code&gt;ClassLoader&lt;/code&gt; instance
+    <summary>Thrown if the Java Virtual Machine or a <c>ClassLoader</c> instance
             tries to load in the definition of a class (as part of a normal method call
-            or as part of creating a new instance using the &lt;code&gt;new&lt;/code&gt; expression)
+            or as part of creating a new instance using the <c>new</c> expression)
             and no definition of the class could be found.</summary>
     <remarks>
       <para>
@@ -54,7 +54,7 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <summary>Constructs a &lt;code&gt;NoClassDefFoundError&lt;/code&gt; with no detail message.</summary>
+        <summary>Constructs a <c>NoClassDefFoundError</c> with no detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -91,7 +91,7 @@
       </Parameters>
       <Docs>
         <param name="s">the detail message.</param>
-        <summary>Constructs a &lt;code&gt;NoClassDefFoundError&lt;/code&gt; with the specified
+        <summary>Constructs a <c>NoClassDefFoundError</c> with the specified
             detail message.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/NoSuchFieldError.xml b/docs/Mono.Android/en/Java.Lang/NoSuchFieldError.xml
index b4631f9236..979a2f2076 100644
--- a/docs/Mono.Android/en/Java.Lang/NoSuchFieldError.xml
+++ b/docs/Mono.Android/en/Java.Lang/NoSuchFieldError.xml
@@ -52,7 +52,7 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <summary>Constructs a &lt;code&gt;NoSuchFieldError&lt;/code&gt; with no detail message.</summary>
+        <summary>Constructs a <c>NoSuchFieldError</c> with no detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -89,7 +89,7 @@
       </Parameters>
       <Docs>
         <param name="s">the detail message.</param>
-        <summary>Constructs a &lt;code&gt;NoSuchFieldError&lt;/code&gt; with the specified
+        <summary>Constructs a <c>NoSuchFieldError</c> with the specified
             detail message.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/NoSuchMethodError.xml b/docs/Mono.Android/en/Java.Lang/NoSuchMethodError.xml
index b4913abec5..1cf0ca02b9 100644
--- a/docs/Mono.Android/en/Java.Lang/NoSuchMethodError.xml
+++ b/docs/Mono.Android/en/Java.Lang/NoSuchMethodError.xml
@@ -53,7 +53,7 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <summary>Constructs a &lt;code&gt;NoSuchMethodError&lt;/code&gt; with no detail message.</summary>
+        <summary>Constructs a <c>NoSuchMethodError</c> with no detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -90,7 +90,7 @@
       </Parameters>
       <Docs>
         <param name="s">the detail message.</param>
-        <summary>Constructs a &lt;code&gt;NoSuchMethodError&lt;/code&gt; with the
+        <summary>Constructs a <c>NoSuchMethodError</c> with the
             specified detail message.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/NoSuchMethodException.xml b/docs/Mono.Android/en/Java.Lang/NoSuchMethodException.xml
index 16402a9875..b1fb03d327 100644
--- a/docs/Mono.Android/en/Java.Lang/NoSuchMethodException.xml
+++ b/docs/Mono.Android/en/Java.Lang/NoSuchMethodException.xml
@@ -51,7 +51,7 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <summary>Constructs a &lt;code&gt;NoSuchMethodException&lt;/code&gt; without a detail message.</summary>
+        <summary>Constructs a <c>NoSuchMethodException</c> without a detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -88,7 +88,7 @@
       </Parameters>
       <Docs>
         <param name="s">the detail message.</param>
-        <summary>Constructs a &lt;code&gt;NoSuchMethodException&lt;/code&gt; with a detail message.</summary>
+        <summary>Constructs a <c>NoSuchMethodException</c> with a detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.Lang/NumberFormatException.xml b/docs/Mono.Android/en/Java.Lang/NumberFormatException.xml
index f94ae612b9..b6c2c59ed0 100644
--- a/docs/Mono.Android/en/Java.Lang/NumberFormatException.xml
+++ b/docs/Mono.Android/en/Java.Lang/NumberFormatException.xml
@@ -53,7 +53,7 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <summary>Constructs a &lt;code&gt;NumberFormatException&lt;/code&gt; with no detail message.</summary>
+        <summary>Constructs a <c>NumberFormatException</c> with no detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -90,7 +90,7 @@
       </Parameters>
       <Docs>
         <param name="s">the detail message.</param>
-        <summary>Constructs a &lt;code&gt;NumberFormatException&lt;/code&gt; with the
+        <summary>Constructs a <c>NumberFormatException</c> with the
             specified detail message.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/Runtime.xml b/docs/Mono.Android/en/Java.Lang/Runtime.xml
index 24a14b2b4d..8b63b2c0fa 100644
--- a/docs/Mono.Android/en/Java.Lang/Runtime.xml
+++ b/docs/Mono.Android/en/Java.Lang/Runtime.xml
@@ -19,7 +19,7 @@
   </Attributes>
   <Docs since="1">
     <summary>Every Java application has a single instance of class
-            &lt;code&gt;Runtime&lt;/code&gt; that allows the application to interface with
+            <c>Runtime</c> that allows the application to interface with
             the environment in which the application is running.</summary>
     <remarks>
       <para>
@@ -669,7 +669,7 @@
       <Parameters />
       <Docs>
         <summary>Returns the runtime object associated with the current Java application.</summary>
-        <returns>the &lt;code&gt;Runtime&lt;/code&gt; object associated with the current
+        <returns>the <c>Runtime</c> object associated with the current
                      Java application.</returns>
         <remarks>
           <para>
@@ -853,7 +853,7 @@
       </Parameters>
       <Docs>
         <param name="libname">the name of the library.</param>
-        <summary>Loads the native library specified by the &lt;code&gt;libname&lt;/code&gt;
+        <summary>Loads the native library specified by the <c>libname</c>
             argument.</summary>
         <remarks>
           <para>
@@ -1191,8 +1191,9 @@
         <Parameter Name="on" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="on">&lt;code&gt;true&lt;/code&gt; to enable instruction tracing;
-                          &lt;code&gt;false&lt;/code&gt; to disable this feature.</param>
+        <param name="on">
+          <c>true</c> to enable instruction tracing;
+                          <c>false</c> to disable this feature.</param>
         <summary>Enables/Disables tracing of instructions.</summary>
         <remarks>
           <para>
@@ -1232,8 +1233,9 @@
         <Parameter Name="on" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="on">&lt;code&gt;true&lt;/code&gt; to enable instruction tracing;
-                          &lt;code&gt;false&lt;/code&gt; to disable this feature.</param>
+        <param name="on">
+          <c>true</c> to enable instruction tracing;
+                          <c>false</c> to disable this feature.</param>
         <summary>Enables/Disables tracing of method calls.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/SecurityException.xml b/docs/Mono.Android/en/Java.Lang/SecurityException.xml
index e531c1d035..df70d69e0c 100644
--- a/docs/Mono.Android/en/Java.Lang/SecurityException.xml
+++ b/docs/Mono.Android/en/Java.Lang/SecurityException.xml
@@ -51,7 +51,7 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <summary>Constructs a &lt;code&gt;SecurityException&lt;/code&gt; with no detail  message.</summary>
+        <summary>Constructs a <c>SecurityException</c> with no detail  message.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -90,7 +90,7 @@
         <param name="cause">the cause (which is saved for later retrieval by the
                    <c>#getCause()</c> method).  (A <c>null</c> value is permitted,
                    and indicates that the cause is nonexistent or unknown.)</param>
-        <summary>Creates a &lt;code&gt;SecurityException&lt;/code&gt; with the specified cause
+        <summary>Creates a <c>SecurityException</c> with the specified cause
             and a detail message of <c>(cause==null ? null : cause.toString())</c>
             (which typically contains the class and detail message of
             <c>cause</c>).</summary>
@@ -130,7 +130,7 @@
       </Parameters>
       <Docs>
         <param name="s">the detail message.</param>
-        <summary>Constructs a &lt;code&gt;SecurityException&lt;/code&gt; with the specified
+        <summary>Constructs a <c>SecurityException</c> with the specified
             detail message.</summary>
         <remarks>
           <para>
@@ -196,7 +196,7 @@
         <param name="cause">the cause (which is saved for later retrieval by the
                    <c>#getCause()</c> method).  (A <c>null</c> value is permitted,
                    and indicates that the cause is nonexistent or unknown.)</param>
-        <summary>Creates a &lt;code&gt;SecurityException&lt;/code&gt; with the specified
+        <summary>Creates a <c>SecurityException</c> with the specified
             detail message and cause.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/StackOverflowError.xml b/docs/Mono.Android/en/Java.Lang/StackOverflowError.xml
index 9c361c0cfb..8ac0be3932 100644
--- a/docs/Mono.Android/en/Java.Lang/StackOverflowError.xml
+++ b/docs/Mono.Android/en/Java.Lang/StackOverflowError.xml
@@ -52,7 +52,7 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <summary>Constructs a &lt;code&gt;StackOverflowError&lt;/code&gt; with no detail message.</summary>
+        <summary>Constructs a <c>StackOverflowError</c> with no detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -89,7 +89,7 @@
       </Parameters>
       <Docs>
         <param name="s">the detail message.</param>
-        <summary>Constructs a &lt;code&gt;StackOverflowError&lt;/code&gt; with the specified
+        <summary>Constructs a <c>StackOverflowError</c> with the specified
             detail message.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/Thread.xml b/docs/Mono.Android/en/Java.Lang/Thread.xml
index 9b5ec5404e..a08ace93b6 100644
--- a/docs/Mono.Android/en/Java.Lang/Thread.xml
+++ b/docs/Mono.Android/en/Java.Lang/Thread.xml
@@ -821,8 +821,9 @@
         <param name="on">if <c>true</c>, marks this thread as a daemon thread</param>
         <summary>Tests if this thread is a daemon thread. -or- Marks this thread as either a #isDaemon daemon thread
             or a user thread.</summary>
-        <value>&lt;code&gt;true&lt;/code&gt; if this thread is a daemon thread;
-                     &lt;code&gt;false&lt;/code&gt; otherwise.</value>
+        <value>
+          <c>true</c> if this thread is a daemon thread;
+                     <c>false</c> otherwise.</value>
         <remarks>
           <para>Property getter documentation:</para>
           <para>
@@ -1249,8 +1250,9 @@
       <Parameters />
       <Docs>
         <summary>Tests whether the current thread has been interrupted.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if the current thread has been interrupted;
-                     &lt;code&gt;false&lt;/code&gt; otherwise.</returns>
+        <returns>
+          <c>true</c> if the current thread has been interrupted;
+                     <c>false</c> otherwise.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1290,8 +1292,9 @@
       </ReturnValue>
       <Docs>
         <summary>Tests if this thread is alive.</summary>
-        <value>&lt;code&gt;true&lt;/code&gt; if this thread is alive;
-                     &lt;code&gt;false&lt;/code&gt; otherwise.</value>
+        <value>
+          <c>true</c> if this thread is alive;
+                     <c>false</c> otherwise.</value>
         <remarks>
           <para>
             <format type="text/html">
@@ -1329,8 +1332,9 @@
       </ReturnValue>
       <Docs>
         <summary>Tests whether this thread has been interrupted.</summary>
-        <value>&lt;code&gt;true&lt;/code&gt; if this thread has been interrupted;
-                     &lt;code&gt;false&lt;/code&gt; otherwise.</value>
+        <value>
+          <c>true</c> if this thread has been interrupted;
+                     <c>false</c> otherwise.</value>
         <remarks>
           <para>
             <format type="text/html">
@@ -1619,7 +1623,7 @@
       <Docs>
         <param name="name">the new name for this thread.</param>
         <summary>Returns this thread's name. -or- Changes the name of this thread to be equal to the argument
-            &lt;code&gt;name&lt;/code&gt;.</summary>
+            <c>name</c>.</summary>
         <value>this thread's name.</value>
         <remarks>
           <para>Property getter documentation:</para>
@@ -1808,8 +1812,8 @@
       <Parameters />
       <Docs>
         <summary>If this thread was constructed using a separate
-            &lt;code&gt;Runnable&lt;/code&gt; run object, then that
-            &lt;code&gt;Runnable&lt;/code&gt; object's &lt;code&gt;run&lt;/code&gt; method is called;
+            <c>Runnable</c> run object, then that
+            <c>Runnable</c> object's <c>run</c> method is called;
             otherwise, this method does nothing and returns.</summary>
         <remarks>
           <para>
@@ -1945,7 +1949,7 @@
       <Parameters />
       <Docs>
         <summary>Causes this thread to begin execution; the Java Virtual Machine
-            calls the &lt;code&gt;run&lt;/code&gt; method of this thread.</summary>
+            calls the <c>run</c> method of this thread.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.Lang/ThreadGroup.xml b/docs/Mono.Android/en/Java.Lang/ThreadGroup.xml
index 0419fec67b..f206c51b8e 100644
--- a/docs/Mono.Android/en/Java.Lang/ThreadGroup.xml
+++ b/docs/Mono.Android/en/Java.Lang/ThreadGroup.xml
@@ -339,12 +339,13 @@
         <ReturnType>System.Boolean</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="daemon">if &lt;code&gt;true&lt;/code&gt;, marks this thread group as
+        <param name="daemon">if <c>true</c>, marks this thread group as
                                  a daemon thread group; otherwise, marks this
                                  thread group as normal.</param>
         <summary>Tests if this thread group is a daemon thread group. -or- Changes the daemon status of this thread group.</summary>
-        <value>&lt;code&gt;true&lt;/code&gt; if this thread group is a daemon thread group;
-                     &lt;code&gt;false&lt;/code&gt; otherwise.</value>
+        <value>
+          <c>true</c> if this thread group is a daemon thread group;
+                     <c>false</c> otherwise.</value>
         <remarks>
           <para>Property getter documentation:</para>
           <para>
@@ -856,7 +857,7 @@
       <Docs>
         <summary>Returns the parent of this thread group.</summary>
         <value>the parent of this thread group. The top-level thread group
-                     is the only thread group whose parent is &lt;code&gt;null&lt;/code&gt;.</value>
+                     is the only thread group whose parent is <c>null</c>.</value>
         <remarks>
           <para>
             <format type="text/html">
@@ -898,9 +899,10 @@
         <param name="g">a thread group.</param>
         <summary>Tests if this thread group is either the thread group
             argument or one of its ancestor thread groups.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if this thread group is the thread group
+        <returns>
+          <c>true</c> if this thread group is the thread group
                      argument or one of its ancestor thread groups;
-                     &lt;code&gt;false&lt;/code&gt; otherwise.</returns>
+                     <c>false</c> otherwise.</returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.Lang/UnknownError.xml b/docs/Mono.Android/en/Java.Lang/UnknownError.xml
index 18b8fbb0d2..9a2966d554 100644
--- a/docs/Mono.Android/en/Java.Lang/UnknownError.xml
+++ b/docs/Mono.Android/en/Java.Lang/UnknownError.xml
@@ -52,7 +52,7 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <summary>Constructs an &lt;code&gt;UnknownError&lt;/code&gt; with no detail message.</summary>
+        <summary>Constructs an <c>UnknownError</c> with no detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -89,7 +89,7 @@
       </Parameters>
       <Docs>
         <param name="s">the detail message.</param>
-        <summary>Constructs an &lt;code&gt;UnknownError&lt;/code&gt; with the specified detail
+        <summary>Constructs an <c>UnknownError</c> with the specified detail
             message.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/UnsatisfiedLinkError.xml b/docs/Mono.Android/en/Java.Lang/UnsatisfiedLinkError.xml
index 86fc38b3b3..bdd2c722a3 100644
--- a/docs/Mono.Android/en/Java.Lang/UnsatisfiedLinkError.xml
+++ b/docs/Mono.Android/en/Java.Lang/UnsatisfiedLinkError.xml
@@ -19,7 +19,7 @@
   </Attributes>
   <Docs since="1">
     <summary>Thrown if the Java Virtual Machine cannot find an appropriate
-            native-language definition of a method declared &lt;code&gt;native&lt;/code&gt;.</summary>
+            native-language definition of a method declared <c>native</c>.</summary>
     <remarks>
       <para>
         <format type="text/html">
@@ -52,7 +52,7 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <summary>Constructs an &lt;code&gt;UnsatisfiedLinkError&lt;/code&gt; with no detail message.</summary>
+        <summary>Constructs an <c>UnsatisfiedLinkError</c> with no detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -89,7 +89,7 @@
       </Parameters>
       <Docs>
         <param name="s">the detail message.</param>
-        <summary>Constructs an &lt;code&gt;UnsatisfiedLinkError&lt;/code&gt; with the
+        <summary>Constructs an <c>UnsatisfiedLinkError</c> with the
             specified detail message.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/UnsupportedClassVersionError.xml b/docs/Mono.Android/en/Java.Lang/UnsupportedClassVersionError.xml
index cfdcbbc9ca..870ada4b58 100644
--- a/docs/Mono.Android/en/Java.Lang/UnsupportedClassVersionError.xml
+++ b/docs/Mono.Android/en/Java.Lang/UnsupportedClassVersionError.xml
@@ -53,7 +53,7 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <summary>Constructs a &lt;code&gt;UnsupportedClassVersionError&lt;/code&gt;
+        <summary>Constructs a <c>UnsupportedClassVersionError</c>
             with no detail message.</summary>
         <remarks>
           <para>
@@ -91,7 +91,7 @@
       </Parameters>
       <Docs>
         <param name="s">the detail message.</param>
-        <summary>Constructs a &lt;code&gt;UnsupportedClassVersionError&lt;/code&gt; with
+        <summary>Constructs a <c>UnsupportedClassVersionError</c> with
             the specified detail message.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/VerifyError.xml b/docs/Mono.Android/en/Java.Lang/VerifyError.xml
index e47ff3c2d1..4cb58c984b 100644
--- a/docs/Mono.Android/en/Java.Lang/VerifyError.xml
+++ b/docs/Mono.Android/en/Java.Lang/VerifyError.xml
@@ -53,7 +53,7 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <summary>Constructs an &lt;code&gt;VerifyError&lt;/code&gt; with no detail message.</summary>
+        <summary>Constructs an <c>VerifyError</c> with no detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -90,7 +90,7 @@
       </Parameters>
       <Docs>
         <param name="s">the detail message.</param>
-        <summary>Constructs an &lt;code&gt;VerifyError&lt;/code&gt; with the specified detail message.</summary>
+        <summary>Constructs an <c>VerifyError</c> with the specified detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.Lang/VirtualMachineError.xml b/docs/Mono.Android/en/Java.Lang/VirtualMachineError.xml
index 9d9ab7b30a..1467cde2c1 100644
--- a/docs/Mono.Android/en/Java.Lang/VirtualMachineError.xml
+++ b/docs/Mono.Android/en/Java.Lang/VirtualMachineError.xml
@@ -52,7 +52,7 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <summary>Constructs a &lt;code&gt;VirtualMachineError&lt;/code&gt; with no detail message.</summary>
+        <summary>Constructs a <c>VirtualMachineError</c> with no detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -131,7 +131,7 @@
       </Parameters>
       <Docs>
         <param name="message">the detail message.</param>
-        <summary>Constructs a &lt;code&gt;VirtualMachineError&lt;/code&gt; with the specified
+        <summary>Constructs a <c>VirtualMachineError</c> with the specified
             detail message.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.Net/URL.xml b/docs/Mono.Android/en/Java.Net/URL.xml
index ff7b9dcd61..cb19ad0bb0 100644
--- a/docs/Mono.Android/en/Java.Net/URL.xml
+++ b/docs/Mono.Android/en/Java.Net/URL.xml
@@ -856,7 +856,7 @@
       <Docs>
         <summary>Gets the query part of this <c>URL</c>.</summary>
         <value>the query part of this <c>URL</c>,
-            or &lt;CODE&gt;null&lt;/CODE&gt; if one does not exist</value>
+            or <c>null</c> if one does not exist</value>
         <remarks>
           <para>
             <format type="text/html">
@@ -895,7 +895,7 @@
         <summary>Gets the anchor (also known as the "reference") of this
             <c>URL</c>.</summary>
         <value>the anchor (also known as the "reference") of this
-                     <c>URL</c>, or &lt;CODE&gt;null&lt;/CODE&gt; if one does not exist</value>
+                     <c>URL</c>, or <c>null</c> if one does not exist</value>
         <remarks>
           <para>
             <format type="text/html">
@@ -1159,7 +1159,7 @@
       <Docs>
         <summary>Gets the userInfo part of this <c>URL</c>.</summary>
         <value>the userInfo part of this <c>URL</c>, or
-            &lt;CODE&gt;null&lt;/CODE&gt; if one does not exist</value>
+            <c>null</c> if one does not exist</value>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.Sql/BatchUpdateException.xml b/docs/Mono.Android/en/Java.Sql/BatchUpdateException.xml
index 65397616c1..2da8a6837f 100644
--- a/docs/Mono.Android/en/Java.Sql/BatchUpdateException.xml
+++ b/docs/Mono.Android/en/Java.Sql/BatchUpdateException.xml
@@ -65,7 +65,7 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <summary>Constructs a &lt;code&gt;BatchUpdateException&lt;/code&gt; object.</summary>
+        <summary>Constructs a <c>BatchUpdateException</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -101,11 +101,11 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt;
-            (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method);
+        <param name="cause">the underlying reason for this <c>SQLException</c>
+            (which is saved for later retrieval by the <c>getCause()</c> method);
             may be null indicating the cause is non-existent or unknown.</param>
-        <summary>Constructs a &lt;code&gt;BatchUpdateException&lt;/code&gt; object initialized with
-             a given &lt;code&gt;cause&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>BatchUpdateException</c> object initialized with
+             a given <c>cause</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -141,16 +141,16 @@
         <Parameter Name="updateCounts" Type="System.Int32[]" />
       </Parameters>
       <Docs>
-        <param name="updateCounts">an array of &lt;code&gt;int&lt;/code&gt;, with each element
-            indicating the update count, &lt;code&gt;Statement.SUCCESS_NO_INFO&lt;/code&gt; or
-            &lt;code&gt;Statement.EXECUTE_FAILED&lt;/code&gt; for each SQL command in
+        <param name="updateCounts">an array of <c>int</c>, with each element
+            indicating the update count, <c>Statement.SUCCESS_NO_INFO</c> or
+            <c>Statement.EXECUTE_FAILED</c> for each SQL command in
             the batch for JDBC drivers that continue processing
             after a command failure; an update count or
-            &lt;code&gt;Statement.SUCCESS_NO_INFO&lt;/code&gt; for each SQL command in the batch
+            <c>Statement.SUCCESS_NO_INFO</c> for each SQL command in the batch
             prior to the failure for JDBC drivers that stop processing after a command
             failure</param>
-        <summary>Constructs a &lt;code&gt;BatchUpdateException&lt;/code&gt; object initialized with a given
-            &lt;code&gt;updateCounts&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>BatchUpdateException</c> object initialized with a given
+            <c>updateCounts</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -187,19 +187,19 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="updateCounts">an array of &lt;code&gt;int&lt;/code&gt;, with each element
-            indicating the update count, &lt;code&gt;Statement.SUCCESS_NO_INFO&lt;/code&gt; or
-            &lt;code&gt;Statement.EXECUTE_FAILED&lt;/code&gt; for each SQL command in
+        <param name="updateCounts">an array of <c>int</c>, with each element
+            indicating the update count, <c>Statement.SUCCESS_NO_INFO</c> or
+            <c>Statement.EXECUTE_FAILED</c> for each SQL command in
             the batch for JDBC drivers that continue processing
             after a command failure; an update count or
-            &lt;code&gt;Statement.SUCCESS_NO_INFO&lt;/code&gt; for each SQL command in the batch
+            <c>Statement.SUCCESS_NO_INFO</c> for each SQL command in the batch
             prior to the failure for JDBC drivers that stop processing after a command
             failure</param>
-        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt;
-            (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+        <param name="cause">the underlying reason for this <c>SQLException</c>
+            (which is saved for later retrieval by the <c>getCause()</c> method); may be null indicating
             the cause is non-existent or unknown.</param>
-        <summary>Constructs a &lt;code&gt;BatchUpdateException&lt;/code&gt; object initialized with a
-            given &lt;code&gt;cause&lt;/code&gt; and &lt;code&gt;updateCounts&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>BatchUpdateException</c> object initialized with a
+            given <c>cause</c> and <c>updateCounts</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -260,16 +260,16 @@
       </Parameters>
       <Docs>
         <param name="reason">a description of the exception</param>
-        <param name="updateCounts">an array of &lt;code&gt;int&lt;/code&gt;, with each element
-            indicating the update count, &lt;code&gt;Statement.SUCCESS_NO_INFO&lt;/code&gt; or
-            &lt;code&gt;Statement.EXECUTE_FAILED&lt;/code&gt; for each SQL command in
+        <param name="updateCounts">an array of <c>int</c>, with each element
+            indicating the update count, <c>Statement.SUCCESS_NO_INFO</c> or
+            <c>Statement.EXECUTE_FAILED</c> for each SQL command in
             the batch for JDBC drivers that continue processing
             after a command failure; an update count or
-            &lt;code&gt;Statement.SUCCESS_NO_INFO&lt;/code&gt; for each SQL command in the batch
+            <c>Statement.SUCCESS_NO_INFO</c> for each SQL command in the batch
             prior to the failure for JDBC drivers that stop processing after a command
             failure</param>
-        <summary>Constructs a &lt;code&gt;BatchUpdateException&lt;/code&gt; object initialized with a given
-            &lt;code&gt;reason&lt;/code&gt; and &lt;code&gt;updateCounts&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>BatchUpdateException</c> object initialized with a given
+            <c>reason</c> and <c>updateCounts</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -308,20 +308,20 @@
       </Parameters>
       <Docs>
         <param name="reason">a description of the exception</param>
-        <param name="updateCounts">an array of &lt;code&gt;int&lt;/code&gt;, with each element
-            indicating the update count, &lt;code&gt;Statement.SUCCESS_NO_INFO&lt;/code&gt; or
-            &lt;code&gt;Statement.EXECUTE_FAILED&lt;/code&gt; for each SQL command in
+        <param name="updateCounts">an array of <c>int</c>, with each element
+            indicating the update count, <c>Statement.SUCCESS_NO_INFO</c> or
+            <c>Statement.EXECUTE_FAILED</c> for each SQL command in
             the batch for JDBC drivers that continue processing
             after a command failure; an update count or
-            &lt;code&gt;Statement.SUCCESS_NO_INFO&lt;/code&gt; for each SQL command in the batch
+            <c>Statement.SUCCESS_NO_INFO</c> for each SQL command in the batch
             prior to the failure for JDBC drivers that stop processing after a command
             failure</param>
-        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method);
+        <param name="cause">the underlying reason for this <c>SQLException</c> (which is saved for later retrieval by the <c>getCause()</c> method);
             may be null indicating
             the cause is non-existent or unknown.</param>
-        <summary>Constructs a &lt;code&gt;BatchUpdateException&lt;/code&gt; object initialized with
-            a given &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;cause&lt;/code&gt;
-            and &lt;code&gt;updateCounts&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>BatchUpdateException</c> object initialized with
+            a given <c>reason</c>, <c>cause</c>
+            and <c>updateCounts</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -361,17 +361,17 @@
       <Docs>
         <param name="reason">a description of the exception</param>
         <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
-        <param name="updateCounts">an array of &lt;code&gt;int&lt;/code&gt;, with each element
-            indicating the update count, &lt;code&gt;Statement.SUCCESS_NO_INFO&lt;/code&gt; or
-            &lt;code&gt;Statement.EXECUTE_FAILED&lt;/code&gt; for each SQL command in
+        <param name="updateCounts">an array of <c>int</c>, with each element
+            indicating the update count, <c>Statement.SUCCESS_NO_INFO</c> or
+            <c>Statement.EXECUTE_FAILED</c> for each SQL command in
             the batch for JDBC drivers that continue processing
             after a command failure; an update count or
-            &lt;code&gt;Statement.SUCCESS_NO_INFO&lt;/code&gt; for each SQL command in the batch
+            <c>Statement.SUCCESS_NO_INFO</c> for each SQL command in the batch
             prior to the failure for JDBC drivers that stop processing after a command
             failure</param>
-        <summary>Constructs a &lt;code&gt;BatchUpdateException&lt;/code&gt; object initialized with a given
-            &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt; and
-            &lt;code&gt;updateCounts&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>BatchUpdateException</c> object initialized with a given
+            <c>reason</c>, <c>SQLState</c> and
+            <c>updateCounts</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -414,17 +414,17 @@
         <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
         <param name="vendorCode">an exception code used by a particular
             database vendor</param>
-        <param name="updateCounts">an array of &lt;code&gt;int&lt;/code&gt;, with each element
-            indicating the update count, &lt;code&gt;Statement.SUCCESS_NO_INFO&lt;/code&gt; or
-            &lt;code&gt;Statement.EXECUTE_FAILED&lt;/code&gt; for each SQL command in
+        <param name="updateCounts">an array of <c>int</c>, with each element
+            indicating the update count, <c>Statement.SUCCESS_NO_INFO</c> or
+            <c>Statement.EXECUTE_FAILED</c> for each SQL command in
             the batch for JDBC drivers that continue processing
             after a command failure; an update count or
-            &lt;code&gt;Statement.SUCCESS_NO_INFO&lt;/code&gt; for each SQL command in the batch
+            <c>Statement.SUCCESS_NO_INFO</c> for each SQL command in the batch
             prior to the failure for JDBC drivers that stop processing after a command
             failure</param>
-        <summary>Constructs a &lt;code&gt;BatchUpdateException&lt;/code&gt; object initialized with a given
-            &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt;, &lt;code&gt;vendorCode&lt;/code&gt; and
-            &lt;code&gt;updateCounts&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>BatchUpdateException</c> object initialized with a given
+            <c>reason</c>, <c>SQLState</c>, <c>vendorCode</c> and
+            <c>updateCounts</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -465,20 +465,20 @@
       <Docs>
         <param name="reason">a description of the exception</param>
         <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
-        <param name="updateCounts">an array of &lt;code&gt;int&lt;/code&gt;, with each element
-            indicating the update count, &lt;code&gt;Statement.SUCCESS_NO_INFO&lt;/code&gt; or
-            &lt;code&gt;Statement.EXECUTE_FAILED&lt;/code&gt; for each SQL command in
+        <param name="updateCounts">an array of <c>int</c>, with each element
+            indicating the update count, <c>Statement.SUCCESS_NO_INFO</c> or
+            <c>Statement.EXECUTE_FAILED</c> for each SQL command in
             the batch for JDBC drivers that continue processing
             after a command failure; an update count or
-            &lt;code&gt;Statement.SUCCESS_NO_INFO&lt;/code&gt; for each SQL command in the batch
+            <c>Statement.SUCCESS_NO_INFO</c> for each SQL command in the batch
             prior to the failure for JDBC drivers that stop processing after a command
             failure</param>
-        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method);
+        <param name="cause">the underlying reason for this <c>SQLException</c> (which is saved for later retrieval by the <c>getCause()</c> method);
             may be null indicating
             the cause is non-existent or unknown.</param>
-        <summary>Constructs a &lt;code&gt;BatchUpdateException&lt;/code&gt; object initialized with
-            a given &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt;,&lt;code&gt;cause&lt;/code&gt;, and
-            &lt;code&gt;updateCounts&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>BatchUpdateException</c> object initialized with
+            a given <c>reason</c>, <c>SQLState</c>,<c>cause</c>, and
+            <c>updateCounts</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -522,20 +522,19 @@
         <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
         <param name="vendorCode">an exception code used by a particular
             database vendor</param>
-        <param name="updateCounts">an array of &lt;code&gt;int&lt;/code&gt;, with each element
-            indicating the update count, &lt;code&gt;Statement.SUCCESS_NO_INFO&lt;/code&gt; or
-            &lt;code&gt;Statement.EXECUTE_FAILED&lt;/code&gt; for each SQL command in
+        <param name="updateCounts">an array of <c>int</c>, with each element
+            indicating the update count, <c>Statement.SUCCESS_NO_INFO</c> or
+            <c>Statement.EXECUTE_FAILED</c> for each SQL command in
             the batch for JDBC drivers that continue processing
             after a command failure; an update count or
-            &lt;code&gt;Statement.SUCCESS_NO_INFO&lt;/code&gt; for each SQL command in the batch
+            <c>Statement.SUCCESS_NO_INFO</c> for each SQL command in the batch
             prior to the failure for JDBC drivers that stop processing after a command
             failure</param>
-        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method);
+        <param name="cause">the underlying reason for this <c>SQLException</c> (which is saved for later retrieval by the <c>getCause()</c> method);
             may be null indicating
             the cause is non-existent or unknown.</param>
-        <summary>Constructs a &lt;code&gt;BatchUpdateException&lt;/code&gt; object initialized with
-            a given &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt;, &lt;code&gt;vendorCode&lt;/code&gt;
-            &lt;code&gt;cause&lt;/code&gt; and &lt;code&gt;updateCounts&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>BatchUpdateException</c> object initialized with
+            a given <c>reason</c>, <c>SQLState</c>, <c>vendorCode</c><c>cause</c> and <c>updateCounts</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -574,15 +573,15 @@
       <Docs>
         <summary>Retrieves the update count for each update statement in the batch
             update that executed successfully before this exception occurred.</summary>
-        <returns>an array of &lt;code&gt;int&lt;/code&gt; containing the update counts
+        <returns>an array of <c>int</c> containing the update counts
             for the updates that were executed successfully before this error
             occurred.  Or, if the driver continues to process commands after an
             error, one of the following for every command in the batch:
             &lt;OL&gt;
             &lt;LI&gt;an update count
-             &lt;LI&gt;&lt;code&gt;Statement.SUCCESS_NO_INFO&lt;/code&gt; to indicate that the command
+             &lt;LI&gt;<c>Statement.SUCCESS_NO_INFO</c> to indicate that the command
                 executed successfully but the number of rows affected is unknown
-             &lt;LI&gt;&lt;code&gt;Statement.EXECUTE_FAILED&lt;/code&gt; to indicate that the command
+             &lt;LI&gt;<c>Statement.EXECUTE_FAILED</c> to indicate that the command
                 failed to execute successfully
             &lt;/OL&gt;</returns>
         <remarks>
diff --git a/docs/Mono.Android/en/Java.Sql/ClientInfoStatus.xml b/docs/Mono.Android/en/Java.Sql/ClientInfoStatus.xml
index aee02f1914..46c8f85fdc 100644
--- a/docs/Mono.Android/en/Java.Sql/ClientInfoStatus.xml
+++ b/docs/Mono.Android/en/Java.Sql/ClientInfoStatus.xml
@@ -19,7 +19,7 @@
   </Attributes>
   <Docs since="9">
     <summary>Enumeration for status of the reason that a property could not be set
-            via a call to &lt;code&gt;Connection.</summary>
+            via a call to <c>Connection.setClientInfo</c></summary>
     <remarks>
       <para>
         <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.Sql/DataTruncation.xml b/docs/Mono.Android/en/Java.Sql/DataTruncation.xml
index 3355cc14c6..424ed7500b 100644
--- a/docs/Mono.Android/en/Java.Sql/DataTruncation.xml
+++ b/docs/Mono.Android/en/Java.Sql/DataTruncation.xml
@@ -31,11 +31,11 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>An exception  thrown as a &lt;code&gt;DataTruncation&lt;/code&gt; exception
+    <summary>An exception  thrown as a <c>DataTruncation</c> exception
             (on writes) or reported as a
-            &lt;code&gt;DataTruncation&lt;/code&gt; warning (on reads)
+            <c>DataTruncation</c> warning (on reads)
              when a data values is unexpectedly truncated for reasons other than its having
-             execeeded &lt;code&gt;MaxFieldSize&lt;/code&gt;.</summary>
+             execeeded <c>MaxFieldSize</c>.</summary>
     <remarks>
       <para>
         <format type="text/html">
@@ -103,10 +103,10 @@
         <param name="read">true if a read was truncated</param>
         <param name="dataSize">the original size of the data</param>
         <param name="transferSize">the size after truncation</param>
-        <summary>Creates a &lt;code&gt;DataTruncation&lt;/code&gt; object
+        <summary>Creates a <c>DataTruncation</c> object
             with the SQLState initialized
-            to 01004 when &lt;code&gt;read&lt;/code&gt; is set to &lt;code&gt;true&lt;/code&gt; and 22001
-            when &lt;code&gt;read&lt;/code&gt; is set to &lt;code&gt;false&lt;/code&gt;,
+            to 01004 when <c>read</c> is set to <c>true</c> and 22001
+            when <c>read</c> is set to <c>false</c>,
             the reason set to "Data truncation", the
             vendor code set to 0, and
             the other fields set to the given values.</summary>
@@ -155,13 +155,13 @@
         <param name="read">true if a read was truncated</param>
         <param name="dataSize">the original size of the data</param>
         <param name="transferSize">the size after truncation</param>
-        <param name="cause">the underlying reason for this &lt;code&gt;DataTruncation&lt;/code&gt;
-            (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method);
+        <param name="cause">the underlying reason for this <c>DataTruncation</c>
+            (which is saved for later retrieval by the <c>getCause()</c> method);
             may be null indicating the cause is non-existent or unknown.</param>
-        <summary>Creates a &lt;code&gt;DataTruncation&lt;/code&gt; object
+        <summary>Creates a <c>DataTruncation</c> object
             with the SQLState initialized
-            to 01004 when &lt;code&gt;read&lt;/code&gt; is set to &lt;code&gt;true&lt;/code&gt; and 22001
-            when &lt;code&gt;read&lt;/code&gt; is set to &lt;code&gt;false&lt;/code&gt;,
+            to 01004 when <c>read</c> is set to <c>true</c> and 22001
+            when <c>read</c> is set to <c>false</c>,
             the reason set to "Data truncation", the
             vendor code set to 0, and
             the other fields set to the given values.</summary>
@@ -310,8 +310,9 @@
       <Docs>
         <summary>Indicates whether the value truncated was a parameter value or
             a column value.</summary>
-        <value>&lt;code&gt;true&lt;/code&gt; if the value truncated was a parameter;
-                    &lt;code&gt;false&lt;/code&gt; if it was a column value</value>
+        <value>
+          <c>true</c> if the value truncated was a parameter;
+                    <c>false</c> if it was a column value</value>
         <remarks>
           <para>
             <format type="text/html">
@@ -348,8 +349,9 @@
       </ReturnValue>
       <Docs>
         <summary>Indicates whether or not the value was truncated on a read.</summary>
-        <value>&lt;code&gt;true&lt;/code&gt; if the value was truncated when read from
-                    the database; &lt;code&gt;false&lt;/code&gt; if the data was truncated on a write</value>
+        <value>
+          <c>true</c> if the value was truncated when read from
+                    the database; <c>false</c> if the data was truncated on a write</value>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.Sql/DatabaseMetaData.xml b/docs/Mono.Android/en/Java.Sql/DatabaseMetaData.xml
index 9e1c0475d4..e5ae9ac105 100644
--- a/docs/Mono.Android/en/Java.Sql/DatabaseMetaData.xml
+++ b/docs/Mono.Android/en/Java.Sql/DatabaseMetaData.xml
@@ -60,7 +60,7 @@
       </ReturnValue>
       <MemberValue>0</MemberValue>
       <Docs>
-        <summary>Indicates that &lt;code&gt;NULL&lt;/code&gt; values might not be allowed.</summary>
+        <summary>Indicates that <c>NULL</c> values might not be allowed.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -101,7 +101,7 @@
       </ReturnValue>
       <MemberValue>1</MemberValue>
       <Docs>
-        <summary>Indicates that &lt;code&gt;NULL&lt;/code&gt; values are definitely allowed.</summary>
+        <summary>Indicates that <c>NULL</c> values are definitely allowed.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -142,7 +142,7 @@
       </ReturnValue>
       <MemberValue>2</MemberValue>
       <Docs>
-        <summary>Indicates that whether &lt;code&gt;NULL&lt;/code&gt; values are allowed is not
+        <summary>Indicates that whether <c>NULL</c> values are allowed is not
             known.</summary>
         <remarks>
           <para>
@@ -434,7 +434,7 @@
       </ReturnValue>
       <MemberValue>0</MemberValue>
       <Docs>
-        <summary>Indicates that the column might not allow &lt;code&gt;NULL&lt;/code&gt; values.</summary>
+        <summary>Indicates that the column might not allow <c>NULL</c> values.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -475,7 +475,7 @@
       </ReturnValue>
       <MemberValue>1</MemberValue>
       <Docs>
-        <summary>Indicates that the column definitely allows &lt;code&gt;NULL&lt;/code&gt; values.</summary>
+        <summary>Indicates that the column definitely allows <c>NULL</c> values.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -757,7 +757,7 @@
       </ReturnValue>
       <MemberValue>0</MemberValue>
       <Docs>
-        <summary>Indicates that &lt;code&gt;NULL&lt;/code&gt; values are not allowed.</summary>
+        <summary>Indicates that <c>NULL</c> values are not allowed.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -837,7 +837,7 @@
       </ReturnValue>
       <MemberValue>1</MemberValue>
       <Docs>
-        <summary>Indicates that &lt;code&gt;NULL&lt;/code&gt; values are allowed.</summary>
+        <summary>Indicates that <c>NULL</c> values are allowed.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -877,7 +877,7 @@
       </ReturnValue>
       <MemberValue>2</MemberValue>
       <Docs>
-        <summary>Indicates that whether &lt;code&gt;NULL&lt;/code&gt; values are allowed
+        <summary>Indicates that whether <c>NULL</c> values are allowed
             is unknown.</summary>
         <remarks>
           <para>
@@ -1039,7 +1039,7 @@
       </ReturnValue>
       <MemberValue>0</MemberValue>
       <Docs>
-        <summary>For the column &lt;code&gt;UPDATE_RULE&lt;/code&gt;,
+        <summary>For the column <c>UPDATE_RULE</c>,
             indicates that
             when the primary key is updated, the foreign key (imported key)
             is changed to agree with it.</summary>
@@ -1165,8 +1165,8 @@
       </ReturnValue>
       <MemberValue>3</MemberValue>
       <Docs>
-        <summary>For the columns &lt;code&gt;UPDATE_RULE&lt;/code&gt;
-            and &lt;code&gt;DELETE_RULE&lt;/code&gt;, indicates that
+        <summary>For the columns <c>UPDATE_RULE</c>
+            and <c>DELETE_RULE</c>, indicates that
             if the primary key has been imported, it cannot be updated or deleted.</summary>
         <remarks>
           <para>
@@ -1249,7 +1249,7 @@
       </ReturnValue>
       <MemberValue>1</MemberValue>
       <Docs>
-        <summary>For the column &lt;code&gt;UPDATE_RULE&lt;/code&gt;, indicates that
+        <summary>For the column <c>UPDATE_RULE</c>, indicates that
             a primary key may not be updated if it has been imported by
             another table as a foreign key.</summary>
         <remarks>
@@ -1292,8 +1292,8 @@
       </ReturnValue>
       <MemberValue>4</MemberValue>
       <Docs>
-        <summary>For the columns &lt;code&gt;UPDATE_RULE&lt;/code&gt;
-            and &lt;code&gt;DELETE_RULE&lt;/code&gt;, indicates that
+        <summary>For the columns <c>UPDATE_RULE</c>
+            and <c>DELETE_RULE</c>, indicates that
             if the primary key is updated or deleted, the foreign key (imported key)
             is set to the default value.</summary>
         <remarks>
@@ -1336,10 +1336,10 @@
       </ReturnValue>
       <MemberValue>2</MemberValue>
       <Docs>
-        <summary>For the columns &lt;code&gt;UPDATE_RULE&lt;/code&gt;
-            and &lt;code&gt;DELETE_RULE&lt;/code&gt;, indicates that
+        <summary>For the columns <c>UPDATE_RULE</c>
+            and <c>DELETE_RULE</c>, indicates that
             when the primary key is updated or deleted, the foreign key (imported key)
-            is changed to &lt;code&gt;NULL&lt;/code&gt;.</summary>
+            is changed to <c>NULL</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -1626,7 +1626,7 @@
       </ReturnValue>
       <MemberValue>0</MemberValue>
       <Docs>
-        <summary>Indicates that &lt;code&gt;NULL&lt;/code&gt; values are not allowed.</summary>
+        <summary>Indicates that <c>NULL</c> values are not allowed.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -1708,7 +1708,7 @@
       </ReturnValue>
       <MemberValue>1</MemberValue>
       <Docs>
-        <summary>Indicates that &lt;code&gt;NULL&lt;/code&gt; values are allowed.</summary>
+        <summary>Indicates that <c>NULL</c> values are allowed.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -1749,7 +1749,7 @@
       </ReturnValue>
       <MemberValue>2</MemberValue>
       <Docs>
-        <summary>Indicates that whether &lt;code&gt;NULL&lt;/code&gt; values are allowed
+        <summary>Indicates that whether <c>NULL</c> values are allowed
             is unknown.</summary>
         <remarks>
           <para>
@@ -1875,7 +1875,9 @@
       <MemberValue>2</MemberValue>
       <Docs>
         <summary>A possible return value for the method
-            &lt;code&gt;DatabaseMetaData.</summary>
+            <c>DatabaseMetaData.getSQLStateType</c> which is used to indicate
+            whether the value returned by the method
+            <c>SQLException.getSQLState</c> is an SQLSTATE value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -1916,7 +1918,9 @@
       <MemberValue>2</MemberValue>
       <Docs>
         <summary>A possible return value for the method
-            &lt;code&gt;DatabaseMetaData.</summary>
+            <c>DatabaseMetaData.getSQLStateType</c> which is used to indicate
+            whether the value returned by the method
+            <c>SQLException.getSQLState</c> is an SQL99 SQLSTATE value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -1958,7 +1962,10 @@
       <MemberValue>1</MemberValue>
       <Docs>
         <summary>A possible return value for the method
-            &lt;code&gt;DatabaseMetaData.</summary>
+            <c>DatabaseMetaData.getSQLStateType</c> which is used to indicate
+            whether the value returned by the method
+            <c>SQLException.getSQLState</c> is an
+            X/Open (now know as Open Group) SQL CLI SQLSTATE value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -2166,7 +2173,7 @@
       </ReturnValue>
       <MemberValue>0</MemberValue>
       <Docs>
-        <summary>Indicates that a &lt;code&gt;NULL&lt;/code&gt; value is NOT allowed for this
+        <summary>Indicates that a <c>NULL</c> value is NOT allowed for this
             data type.</summary>
         <remarks>
           <para>
@@ -2208,7 +2215,7 @@
       </ReturnValue>
       <MemberValue>1</MemberValue>
       <Docs>
-        <summary>Indicates that a &lt;code&gt;NULL&lt;/code&gt; value is allowed for this
+        <summary>Indicates that a <c>NULL</c> value is allowed for this
             data type.</summary>
         <remarks>
           <para>
@@ -2250,7 +2257,7 @@
       </ReturnValue>
       <MemberValue>2</MemberValue>
       <Docs>
-        <summary>Indicates that it is not known whether a &lt;code&gt;NULL&lt;/code&gt; value
+        <summary>Indicates that it is not known whether a <c>NULL</c> value
             is allowed for this data type.</summary>
         <remarks>
           <para>
@@ -2292,9 +2299,9 @@
       </ReturnValue>
       <MemberValue>2</MemberValue>
       <Docs>
-        <summary>Indicates that the data type can be only be used in &lt;code&gt;WHERE&lt;/code&gt;
+        <summary>Indicates that the data type can be only be used in <c>WHERE</c>
             search clauses
-            that do not use &lt;code&gt;LIKE&lt;/code&gt; predicates.</summary>
+            that do not use <c>LIKE</c> predicates.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -2336,8 +2343,8 @@
       <MemberValue>1</MemberValue>
       <Docs>
         <summary>Indicates that the data type
-            can be only be used in &lt;code&gt;WHERE&lt;/code&gt; search clauses
-            that  use &lt;code&gt;LIKE&lt;/code&gt; predicates.</summary>
+            can be only be used in <c>WHERE</c> search clauses
+            that  use <c>LIKE</c> predicates.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -2378,7 +2385,7 @@
       </ReturnValue>
       <MemberValue>0</MemberValue>
       <Docs>
-        <summary>Indicates that &lt;code&gt;WHERE&lt;/code&gt; search clauses are not supported
+        <summary>Indicates that <c>WHERE</c> search clauses are not supported
             for this type.</summary>
         <remarks>
           <para>
@@ -2420,7 +2427,7 @@
       </ReturnValue>
       <MemberValue>3</MemberValue>
       <Docs>
-        <summary>Indicates that all &lt;code&gt;WHERE&lt;/code&gt; search clauses can be
+        <summary>Indicates that all <c>WHERE</c> search clauses can be
             based on this type.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.Sql/Date.xml b/docs/Mono.Android/en/Java.Sql/Date.xml
index dd1ff80d95..855856118b 100644
--- a/docs/Mono.Android/en/Java.Sql/Date.xml
+++ b/docs/Mono.Android/en/Java.Sql/Date.xml
@@ -19,7 +19,7 @@
   </Attributes>
   <Docs since="1">
     <summary>A thin wrapper around a millisecond value that allows
-            JDBC to identify this as an SQL &lt;code&gt;DATE&lt;/code&gt; value.</summary>
+            JDBC to identify this as an SQL <c>DATE</c> value.</summary>
     <remarks>
       <para>
         <format type="text/html">
@@ -59,7 +59,7 @@
                    to exceed the milliseconds representation for the year 8099.
                    A negative number indicates the number of milliseconds
                    before January 1, 1970, 00:00:00 GMT.</param>
-        <summary>Constructs a &lt;code&gt;Date&lt;/code&gt; object using the given milliseconds
+        <summary>Constructs a <c>Date</c> object using the given milliseconds
             time value.</summary>
         <remarks>
           <para>
@@ -129,7 +129,7 @@
                    8099 is 9999 minus 1900.)</param>
         <param name="month">0 to 11</param>
         <param name="day">1 to 31</param>
-        <summary>Constructs a &lt;code&gt;Date&lt;/code&gt; object initialized with the given
+        <summary>Constructs a <c>Date</c> object initialized with the given
             year, month, and day.</summary>
         <remarks>
           <para>
@@ -262,12 +262,12 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">a &lt;code&gt;String&lt;/code&gt; object representing a date in
-                   in the format "yyyy-[m]m-[d]d". The leading zero for &lt;code&gt;mm&lt;/code&gt;
-            and &lt;code&gt;dd&lt;/code&gt; may also be omitted.</param>
+        <param name="s">a <c>String</c> object representing a date in
+                   in the format "yyyy-[m]m-[d]d". The leading zero for <c>mm</c>
+            and <c>dd</c> may also be omitted.</param>
         <summary>Converts a string in JDBC date escape format to
-            a &lt;code&gt;Date&lt;/code&gt; value.</summary>
-        <returns>a &lt;code&gt;java.sql.Date&lt;/code&gt; object representing the
+            a <c>Date</c> value.</summary>
+        <returns>a <c>java.sql.Date</c> object representing the
                     given date</returns>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.Sql/DriverManager.xml b/docs/Mono.Android/en/Java.Sql/DriverManager.xml
index 28d9c51cfb..6411440c51 100644
--- a/docs/Mono.Android/en/Java.Sql/DriverManager.xml
+++ b/docs/Mono.Android/en/Java.Sql/DriverManager.xml
@@ -81,7 +81,7 @@
       </Parameters>
       <Docs>
         <param name="driver">the JDBC Driver to drop</param>
-        <summary>Drops a driver from the &lt;code&gt;DriverManager&lt;/code&gt;'s list.</summary>
+        <summary>Drops a driver from the <c>DriverManager</c>'s list.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -162,7 +162,7 @@
       </Parameters>
       <Docs>
         <param name="url">a database url of the form
-             &lt;code&gt; jdbc:&lt;em&gt;subprotocol&lt;/em&gt;:&lt;em&gt;subname&lt;/em&gt;&lt;/code&gt;</param>
+             <c> jdbc:&lt;em&gt;subprotocol&lt;/em&gt;:&lt;em&gt;subname&lt;/em&gt;</c></param>
         <summary>Attempts to establish a connection to the given database URL.</summary>
         <returns>a connection to the URL</returns>
         <remarks>
@@ -208,7 +208,7 @@
       </Parameters>
       <Docs>
         <param name="url">a database url of the form
-            &lt;code&gt; jdbc:&lt;em&gt;subprotocol&lt;/em&gt;:&lt;em&gt;subname&lt;/em&gt;&lt;/code&gt;</param>
+            <c> jdbc:&lt;em&gt;subprotocol&lt;/em&gt;:&lt;em&gt;subname&lt;/em&gt;</c></param>
         <param name="info">a list of arbitrary string tag/value pairs as
             connection arguments; normally at least a "user" and
             "password" property should be included</param>
@@ -258,7 +258,7 @@
       </Parameters>
       <Docs>
         <param name="url">a database url of the form
-            &lt;code&gt;jdbc:&lt;em&gt;subprotocol&lt;/em&gt;:&lt;em&gt;subname&lt;/em&gt;&lt;/code&gt;</param>
+            <c>jdbc:&lt;em&gt;subprotocol&lt;/em&gt;:&lt;em&gt;subname&lt;/em&gt;</c></param>
         <param name="user">the database user on whose behalf the connection is being
               made</param>
         <param name="password">the user's password</param>
@@ -306,9 +306,9 @@
       </Parameters>
       <Docs>
         <param name="url">a database URL of the form
-                &lt;code&gt;jdbc:&lt;em&gt;subprotocol&lt;/em&gt;:&lt;em&gt;subname&lt;/em&gt;&lt;/code&gt;</param>
+                <c>jdbc:&lt;em&gt;subprotocol&lt;/em&gt;:&lt;em&gt;subname&lt;/em&gt;</c></param>
         <summary>Attempts to locate a driver that understands the given URL.</summary>
-        <returns>a &lt;code&gt;Driver&lt;/code&gt; object representing a driver
+        <returns>a <c>Driver</c> object representing a driver
             that can connect to the given URL</returns>
         <remarks>
           <para>
@@ -437,12 +437,12 @@
         <ReturnType>Java.IO.PrintStream</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="out">the new logging/tracing PrintStream; to disable, set to &lt;code&gt;null&lt;/code&gt;</param>
-        <summary>Retrieves the logging/tracing PrintStream that is used by the &lt;code&gt;DriverManager&lt;/code&gt;
+        <param name="out">the new logging/tracing PrintStream; to disable, set to <c>null</c></param>
+        <summary>Retrieves the logging/tracing PrintStream that is used by the <c>DriverManager</c>
             and all drivers. -or- Sets the logging/tracing PrintStream that is used
-            by the &lt;code&gt;DriverManager&lt;/code&gt;
+            by the <c>DriverManager</c>
             and all drivers.</summary>
-        <value>the logging/tracing PrintStream; if disabled, is &lt;code&gt;null&lt;/code&gt;</value>
+        <value>the logging/tracing PrintStream; if disabled, is <c>null</c></value>
         <remarks>
           <para>Property getter documentation:</para>
           <para>
@@ -489,11 +489,11 @@
         <ReturnType>Java.IO.PrintWriter</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="out">the new logging/tracing &lt;code&gt;PrintStream&lt;/code&gt; object;
-                 &lt;code&gt;null&lt;/code&gt; to disable logging and tracing</param>
-        <summary>Retrieves the log writer. -or- Sets the logging/tracing &lt;code&gt;PrintWriter&lt;/code&gt; object
-            that is used by the &lt;code&gt;DriverManager&lt;/code&gt; and all drivers.</summary>
-        <value>a &lt;code&gt;java.io.PrintWriter&lt;/code&gt; object</value>
+        <param name="out">the new logging/tracing <c>PrintStream</c> object;
+                 <c>null</c> to disable logging and tracing</param>
+        <summary>Retrieves the log writer. -or- Sets the logging/tracing <c>PrintWriter</c> object
+            that is used by the <c>DriverManager</c> and all drivers.</summary>
+        <value>a <c>java.io.PrintWriter</c> object</value>
         <remarks>
           <para>Property getter documentation:</para>
           <para>
@@ -605,8 +605,8 @@
       </Parameters>
       <Docs>
         <param name="driver">the new JDBC Driver that is to be registered with the
-                          &lt;code&gt;DriverManager&lt;/code&gt;</param>
-        <summary>Registers the given driver with the &lt;code&gt;DriverManager&lt;/code&gt;.</summary>
+                          <c>DriverManager</c></param>
+        <summary>Registers the given driver with the <c>DriverManager</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.Sql/DriverPropertyInfo.xml b/docs/Mono.Android/en/Java.Sql/DriverPropertyInfo.xml
index de455921c2..a433824192 100644
--- a/docs/Mono.Android/en/Java.Sql/DriverPropertyInfo.xml
+++ b/docs/Mono.Android/en/Java.Sql/DriverPropertyInfo.xml
@@ -80,7 +80,7 @@
       <Docs>
         <param name="name">the name of the property</param>
         <param name="value">the current value, which may be null</param>
-        <summary>Constructs a &lt;code&gt;DriverPropertyInfo&lt;/code&gt; object with a  given
+        <summary>Constructs a <c>DriverPropertyInfo</c> object with a  given
             name and value.</summary>
         <remarks>
           <para>
@@ -118,7 +118,8 @@
       </ReturnValue>
       <Docs>
         <summary>An array of possible values if the value for the field
-            &lt;code&gt;DriverPropertyInfo.</summary>
+            <c>DriverPropertyInfo.value</c> may be selected
+            from a particular set of values; otherwise null.</summary>
         <value>To be added.</value>
         <remarks>
           <para>
@@ -260,9 +261,9 @@
         <ReturnType>System.Boolean</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>The &lt;code&gt;required&lt;/code&gt; field is &lt;code&gt;true&lt;/code&gt; if a value must be
+        <summary>The <c>required</c> field is <c>true</c> if a value must be
             supplied for this property
-            during &lt;code&gt;Driver.</summary>
+            during <c>Driver.connect</c> and <c>false</c> otherwise.</summary>
         <value>To be added.</value>
         <remarks>
           <para>
@@ -361,9 +362,9 @@
         <ReturnType>System.String</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>The &lt;code&gt;value&lt;/code&gt; field specifies the current value of
+        <summary>The <c>value</c> field specifies the current value of
             the property, based on a combination of the information
-            supplied to the method &lt;code&gt;getPropertyInfo&lt;/code&gt;, the
+            supplied to the method <c>getPropertyInfo</c>, the
             Java environment, and the driver-supplied default values.</summary>
         <value>To be added.</value>
         <remarks>
diff --git a/docs/Mono.Android/en/Java.Sql/IArray.xml b/docs/Mono.Android/en/Java.Sql/IArray.xml
index 1457e041fe..f63dcdb9c2 100644
--- a/docs/Mono.Android/en/Java.Sql/IArray.xml
+++ b/docs/Mono.Android/en/Java.Sql/IArray.xml
@@ -26,7 +26,7 @@
   </Attributes>
   <Docs since="1">
     <summary>The mapping in the Java programming language for the SQL type
-            &lt;code&gt;ARRAY&lt;/code&gt;.</summary>
+            <c>ARRAY</c>.</summary>
     <remarks>
       <para>
         <format type="text/html">
@@ -156,7 +156,7 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>This method frees the &lt;code&gt;Array&lt;/code&gt; object and releases the resources that
+        <summary>This method frees the <c>Array</c> object and releases the resources that
             it holds.</summary>
         <remarks>
           <para>
@@ -197,10 +197,10 @@
         <Parameter Name="map" Type="System.Collections.Generic.IDictionary&lt;System.String,Java.Lang.Class&gt;" />
       </Parameters>
       <Docs>
-        <param name="map">a &lt;code&gt;java.util.Map&lt;/code&gt; object that contains mappings
+        <param name="map">a <c>java.util.Map</c> object that contains mappings
                        of SQL type names to classes in the Java programming language</param>
-        <summary>Retrieves the contents of the SQL &lt;code&gt;ARRAY&lt;/code&gt; value designated by this
-            &lt;code&gt;Array&lt;/code&gt; object.</summary>
+        <summary>Retrieves the contents of the SQL <c>ARRAY</c> value designated by this
+            <c>Array</c> object.</summary>
         <returns>an array in the Java programming language that contains the ordered
                     elements of the SQL array designated by this object</returns>
         <remarks>
@@ -245,12 +245,12 @@
         <param name="index">the array index of the first element to retrieve;
                          the first element is at index 1</param>
         <param name="count">the number of successive SQL array elements to retrieve</param>
-        <summary>Retrieves a slice of the SQL &lt;code&gt;ARRAY&lt;/code&gt;
-            value designated by this &lt;code&gt;Array&lt;/code&gt; object, beginning with the
-            specified &lt;code&gt;index&lt;/code&gt; and containing up to &lt;code&gt;count&lt;/code&gt;
+        <summary>Retrieves a slice of the SQL <c>ARRAY</c>
+            value designated by this <c>Array</c> object, beginning with the
+            specified <c>index</c> and containing up to <c>count</c>
             successive elements of the SQL array.</summary>
-        <returns>an array containing up to &lt;code&gt;count&lt;/code&gt; consecutive elements
-            of the SQL array, beginning with element &lt;code&gt;index&lt;/code&gt;</returns>
+        <returns>an array containing up to <c>count</c> consecutive elements
+            of the SQL array, beginning with element <c>index</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -297,17 +297,17 @@
                          the first element is at index 1</param>
         <param name="count">the number of successive SQL array elements to
             retrieve</param>
-        <param name="map">a &lt;code&gt;java.util.Map&lt;/code&gt; object
+        <param name="map">a <c>java.util.Map</c> object
             that contains SQL type names and the classes in
             the Java programming language to which they are mapped</param>
-        <summary>Retreives a slice of the SQL &lt;code&gt;ARRAY&lt;/code&gt; value
-            designated by this &lt;code&gt;Array&lt;/code&gt; object, beginning with the specified
-            &lt;code&gt;index&lt;/code&gt; and containing up to &lt;code&gt;count&lt;/code&gt;
+        <summary>Retreives a slice of the SQL <c>ARRAY</c> value
+            designated by this <c>Array</c> object, beginning with the specified
+            <c>index</c> and containing up to <c>count</c>
             successive elements of the SQL array.</summary>
-        <returns>an array containing up to &lt;code&gt;count&lt;/code&gt;
-            consecutive elements of the SQL &lt;code&gt;ARRAY&lt;/code&gt; value designated by this
-            &lt;code&gt;Array&lt;/code&gt; object, beginning with element
-            &lt;code&gt;index&lt;/code&gt;</returns>
+        <returns>an array containing up to <c>count</c>
+            consecutive elements of the SQL <c>ARRAY</c> value designated by this
+            <c>Array</c> object, beginning with element
+            <c>index</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -348,9 +348,9 @@
         <param name="map">contains the mapping of SQL user-defined types to
             classes in the Java programming language</param>
         <summary>Retrieves a result set that contains the elements of the SQL
-            &lt;code&gt;ARRAY&lt;/code&gt; value designated by this &lt;code&gt;Array&lt;/code&gt; object.</summary>
-        <returns>a &lt;code&gt;ResultSet&lt;/code&gt; object containing one row for each
-            of the elements in the array designated by this &lt;code&gt;Array&lt;/code&gt;
+            <c>ARRAY</c> value designated by this <c>Array</c> object.</summary>
+        <returns>a <c>ResultSet</c> object containing one row for each
+            of the elements in the array designated by this <c>Array</c>
             object, with the rows in ascending order based on the indices.</returns>
         <remarks>
           <para>
@@ -394,12 +394,12 @@
                          the first element is at index 1</param>
         <param name="count">the number of successive SQL array elements to retrieve</param>
         <summary>Retrieves a result set holding the elements of the subarray that
-            starts at index &lt;code&gt;index&lt;/code&gt; and contains up to
-            &lt;code&gt;count&lt;/code&gt; successive elements.</summary>
-        <returns>a &lt;code&gt;ResultSet&lt;/code&gt; object containing up to
-            &lt;code&gt;count&lt;/code&gt; consecutive elements of the SQL array
-            designated by this &lt;code&gt;Array&lt;/code&gt; object, starting at
-            index &lt;code&gt;index&lt;/code&gt;.</returns>
+            starts at index <c>index</c> and contains up to
+            <c>count</c> successive elements.</summary>
+        <returns>a <c>ResultSet</c> object containing up to
+            <c>count</c> consecutive elements of the SQL array
+            designated by this <c>Array</c> object, starting at
+            index <c>index</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -445,15 +445,15 @@
         <param name="index">the array index of the first element to retrieve;
                          the first element is at index 1</param>
         <param name="count">the number of successive SQL array elements to retrieve</param>
-        <param name="map">the &lt;code&gt;Map&lt;/code&gt; object that contains the mapping
+        <param name="map">the <c>Map</c> object that contains the mapping
             of SQL type names to classes in the Java(tm) programming language</param>
         <summary>Retrieves a result set holding the elements of the subarray that
-            starts at index &lt;code&gt;index&lt;/code&gt; and contains up to
-            &lt;code&gt;count&lt;/code&gt; successive elements.</summary>
-        <returns>a &lt;code&gt;ResultSet&lt;/code&gt; object containing up to
-            &lt;code&gt;count&lt;/code&gt; consecutive elements of the SQL array
-            designated by this &lt;code&gt;Array&lt;/code&gt; object, starting at
-            index &lt;code&gt;index&lt;/code&gt;.</returns>
+            starts at index <c>index</c> and contains up to
+            <c>count</c> successive elements.</summary>
+        <returns>a <c>ResultSet</c> object containing up to
+            <c>count</c> consecutive elements of the SQL array
+            designated by this <c>Array</c> object, starting at
+            index <c>index</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.Sql/IBlob.xml b/docs/Mono.Android/en/Java.Sql/IBlob.xml
index 3008cf2483..8f69385720 100644
--- a/docs/Mono.Android/en/Java.Sql/IBlob.xml
+++ b/docs/Mono.Android/en/Java.Sql/IBlob.xml
@@ -28,7 +28,7 @@
     <summary>The representation (mapping) in
             the Java&lt;sup&gt;&lt;font size=-2&gt;TM&lt;/font&gt;&lt;/sup&gt; programming
             language of an SQL
-            &lt;code&gt;BLOB&lt;/code&gt; value.</summary>
+            <c>BLOB</c> value.</summary>
     <remarks>
       <para>
         <format type="text/html">
@@ -95,7 +95,7 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>This method frees the &lt;code&gt;Blob&lt;/code&gt; object and releases the resources that
+        <summary>This method frees the <c>Blob</c> object and releases the resources that
             it holds.</summary>
         <remarks>
           <para>
@@ -138,11 +138,12 @@
       </Parameters>
       <Docs>
         <param name="pos">the offset to the first byte of the partial value to be retrieved.
-             The first byte in the &lt;code&gt;Blob&lt;/code&gt; is at position 1</param>
+             The first byte in the <c>Blob</c> is at position 1</param>
         <param name="length">the length in bytes of the partial value to be retrieved</param>
-        <summary>Returns an &lt;code&gt;InputStream&lt;/code&gt; object that contains a partial &lt;code&gt;Blob&lt;/code&gt; value,
+        <summary>Returns an <c>InputStream</c> object that contains a partial <c>Blob</c> value,
             starting  with the byte specified by pos, which is length bytes in length.</summary>
-        <returns>&lt;code&gt;InputStream&lt;/code&gt; through which the partial &lt;code&gt;Blob&lt;/code&gt; value can be read.</returns>
+        <returns>
+          <c>InputStream</c> through which the partial <c>Blob</c> value can be read.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -185,17 +186,17 @@
       </Parameters>
       <Docs>
         <param name="pos">the ordinal position of the first byte in the
-                   &lt;code&gt;BLOB&lt;/code&gt; value to be extracted; the first byte is at
+                   <c>BLOB</c> value to be extracted; the first byte is at
                    position 1</param>
         <param name="length">the number of consecutive bytes to be copied; the value
             for length must be 0 or greater</param>
-        <summary>Retrieves all or part of the &lt;code&gt;BLOB&lt;/code&gt;
-            value that this &lt;code&gt;Blob&lt;/code&gt; object represents, as an array of
+        <summary>Retrieves all or part of the <c>BLOB</c>
+            value that this <c>Blob</c> object represents, as an array of
             bytes.</summary>
-        <returns>a byte array containing up to &lt;code&gt;length&lt;/code&gt;
-                    consecutive bytes from the &lt;code&gt;BLOB&lt;/code&gt; value designated
-                    by this &lt;code&gt;Blob&lt;/code&gt; object, starting with the
-                    byte at position &lt;code&gt;pos&lt;/code&gt;</returns>
+        <returns>a byte array containing up to <c>length</c>
+                    consecutive bytes from the <c>BLOB</c> value designated
+                    by this <c>Blob</c> object, starting with the
+                    byte at position <c>pos</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -234,9 +235,9 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Returns the number of bytes in the &lt;code&gt;BLOB&lt;/code&gt; value
-            designated by this &lt;code&gt;Blob&lt;/code&gt; object.</summary>
-        <returns>length of the &lt;code&gt;BLOB&lt;/code&gt; in bytes</returns>
+        <summary>Returns the number of bytes in the <c>BLOB</c> value
+            designated by this <c>Blob</c> object.</summary>
+        <returns>length of the <c>BLOB</c> in bytes</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -278,13 +279,13 @@
         <Parameter Name="start" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="pattern">the &lt;code&gt;Blob&lt;/code&gt; object designating
-            the &lt;code&gt;BLOB&lt;/code&gt; value for which to search</param>
-        <param name="start">the position in the &lt;code&gt;BLOB&lt;/code&gt; value
+        <param name="pattern">the <c>Blob</c> object designating
+            the <c>BLOB</c> value for which to search</param>
+        <param name="start">the position in the <c>BLOB</c> value
                    at which to begin searching; the first position is 1</param>
-        <summary>Retrieves the byte position in the &lt;code&gt;BLOB&lt;/code&gt; value
-            designated by this &lt;code&gt;Blob&lt;/code&gt; object at which
-            &lt;code&gt;pattern&lt;/code&gt; begins.</summary>
+        <summary>Retrieves the byte position in the <c>BLOB</c> value
+            designated by this <c>Blob</c> object at which
+            <c>pattern</c> begins.</summary>
         <returns>the position at which the pattern begins, else -1</returns>
         <remarks>
           <para>
@@ -331,8 +332,8 @@
         <param name="start">the position at which to begin searching; the
                    first position is 1</param>
         <summary>Retrieves the byte position at which the specified byte array
-            &lt;code&gt;pattern&lt;/code&gt; begins within the &lt;code&gt;BLOB&lt;/code&gt;
-            value that this &lt;code&gt;Blob&lt;/code&gt; object represents.</summary>
+            <c>pattern</c> begins within the <c>BLOB</c>
+            value that this <c>Blob</c> object represents.</summary>
         <returns>the position at which the pattern appears, else -1</returns>
         <remarks>
           <para>
@@ -374,11 +375,11 @@
         <Parameter Name="pos" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="pos">the position in the &lt;code&gt;BLOB&lt;/code&gt; value at which
+        <param name="pos">the position in the <c>BLOB</c> value at which
                    to start writing; the first position is 1</param>
-        <summary>Retrieves a stream that can be used to write to the &lt;code&gt;BLOB&lt;/code&gt;
-            value that this &lt;code&gt;Blob&lt;/code&gt; object represents.</summary>
-        <returns>a &lt;code&gt;java.io.OutputStream&lt;/code&gt; object to which data can
+        <summary>Retrieves a stream that can be used to write to the <c>BLOB</c>
+            value that this <c>Blob</c> object represents.</summary>
+        <returns>a <c>java.io.OutputStream</c> object to which data can
                     be written</returns>
         <remarks>
           <para>
@@ -421,13 +422,13 @@
         <Parameter Name="bytes" Type="System.Byte[]" />
       </Parameters>
       <Docs>
-        <param name="pos">the position in the &lt;code&gt;BLOB&lt;/code&gt; object at which
+        <param name="pos">the position in the <c>BLOB</c> object at which
                    to start writing; the first position is 1</param>
-        <param name="bytes">the array of bytes to be written to the &lt;code&gt;BLOB&lt;/code&gt;
-                   value that this &lt;code&gt;Blob&lt;/code&gt; object represents</param>
-        <summary>Writes the given array of bytes to the &lt;code&gt;BLOB&lt;/code&gt; value that
-            this &lt;code&gt;Blob&lt;/code&gt; object represents, starting at position
-            &lt;code&gt;pos&lt;/code&gt;, and returns the number of bytes written.</summary>
+        <param name="bytes">the array of bytes to be written to the <c>BLOB</c>
+                   value that this <c>Blob</c> object represents</param>
+        <summary>Writes the given array of bytes to the <c>BLOB</c> value that
+            this <c>Blob</c> object represents, starting at position
+            <c>pos</c>, and returns the number of bytes written.</summary>
         <returns>the number of bytes written</returns>
         <remarks>
           <para>
@@ -472,16 +473,16 @@
         <Parameter Name="len" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="pos">the position in the &lt;code&gt;BLOB&lt;/code&gt; object at which
+        <param name="pos">the position in the <c>BLOB</c> object at which
                    to start writing; the first position is 1</param>
-        <param name="bytes">the array of bytes to be written to this &lt;code&gt;BLOB&lt;/code&gt;
+        <param name="bytes">the array of bytes to be written to this <c>BLOB</c>
                    object</param>
-        <param name="offset">the offset into the array &lt;code&gt;bytes&lt;/code&gt; at which
+        <param name="offset">the offset into the array <c>bytes</c> at which
                    to start reading the bytes to be set</param>
-        <param name="len">the number of bytes to be written to the &lt;code&gt;BLOB&lt;/code&gt;
-                   value from the array of bytes &lt;code&gt;bytes&lt;/code&gt;</param>
-        <summary>Writes all or part of the given &lt;code&gt;byte&lt;/code&gt; array to the
-            &lt;code&gt;BLOB&lt;/code&gt; value that this &lt;code&gt;Blob&lt;/code&gt; object represents
+        <param name="len">the number of bytes to be written to the <c>BLOB</c>
+                   value from the array of bytes <c>bytes</c></param>
+        <summary>Writes all or part of the given <c>byte</c> array to the
+            <c>BLOB</c> value that this <c>Blob</c> object represents
             and returns the number of bytes written.</summary>
         <returns>the number of bytes written</returns>
         <remarks>
@@ -524,10 +525,10 @@
         <Parameter Name="len" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="len">the length, in bytes, to which the &lt;code&gt;BLOB&lt;/code&gt; value
-                   that this &lt;code&gt;Blob&lt;/code&gt; object represents should be truncated</param>
-        <summary>Truncates the &lt;code&gt;BLOB&lt;/code&gt; value that this &lt;code&gt;Blob&lt;/code&gt;
-            object represents to be &lt;code&gt;len&lt;/code&gt; bytes in length.</summary>
+        <param name="len">the length, in bytes, to which the <c>BLOB</c> value
+                   that this <c>Blob</c> object represents should be truncated</param>
+        <summary>Truncates the <c>BLOB</c> value that this <c>Blob</c>
+            object represents to be <c>len</c> bytes in length.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.Sql/ICallableStatement.xml b/docs/Mono.Android/en/Java.Sql/ICallableStatement.xml
index 6213c7124c..168807fdc9 100644
--- a/docs/Mono.Android/en/Java.Sql/ICallableStatement.xml
+++ b/docs/Mono.Android/en/Java.Sql/ICallableStatement.xml
@@ -75,11 +75,11 @@
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2, and
             so on</param>
-        <summary>Retrieves the value of the designated JDBC &lt;code&gt;ARRAY&lt;/code&gt; parameter as an
+        <summary>Retrieves the value of the designated JDBC <c>ARRAY</c> parameter as an
             <c>java.sql.Array</c> object in the Java programming language.</summary>
-        <returns>the parameter value as an &lt;code&gt;Array&lt;/code&gt; object in
-            the Java programming language.  If the value was SQL &lt;code&gt;NULL&lt;/code&gt;, the
-            value &lt;code&gt;null&lt;/code&gt; is returned.</returns>
+        <returns>the parameter value as an <c>Array</c> object in
+            the Java programming language.  If the value was SQL <c>NULL</c>, the
+            value <c>null</c> is returned.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -121,11 +121,11 @@
       </Parameters>
       <Docs>
         <param name="parameterName">the name of the parameter</param>
-        <summary>Retrieves the value of a JDBC &lt;code&gt;ARRAY&lt;/code&gt; parameter as an
+        <summary>Retrieves the value of a JDBC <c>ARRAY</c> parameter as an
             <c>java.sql.Array</c> object in the Java programming language.</summary>
-        <returns>the parameter value as an &lt;code&gt;Array&lt;/code&gt; object in
-                    Java programming language.  If the value was SQL &lt;code&gt;NULL&lt;/code&gt;,
-                    the value &lt;code&gt;null&lt;/code&gt; is returned.</returns>
+        <returns>the parameter value as an <c>Array</c> object in
+                    Java programming language.  If the value was SQL <c>NULL</c>,
+                    the value <c>null</c> is returned.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -168,10 +168,11 @@
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2,
             and so on</param>
-        <summary>Retrieves the value of the designated JDBC &lt;code&gt;NUMERIC&lt;/code&gt; parameter as a
-            &lt;code&gt;java.</summary>
+        <summary>Retrieves the value of the designated JDBC <c>NUMERIC</c> parameter as a
+            <c>java.math.BigDecimal</c> object with as many digits to the
+            right of the decimal point as the value contains.</summary>
         <returns>the parameter value in full precision.  If the value is
-            SQL &lt;code&gt;NULL&lt;/code&gt;, the result is &lt;code&gt;null&lt;/code&gt;.</returns>
+            SQL <c>NULL</c>, the result is <c>null</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -213,10 +214,11 @@
       </Parameters>
       <Docs>
         <param name="parameterName">the name of the parameter</param>
-        <summary>Retrieves the value of a JDBC &lt;code&gt;NUMERIC&lt;/code&gt; parameter as a
-            &lt;code&gt;java.</summary>
+        <summary>Retrieves the value of a JDBC <c>NUMERIC</c> parameter as a
+            <c>java.math.BigDecimal</c> object with as many digits to the
+            right of the decimal point as the value contains.</summary>
         <returns>the parameter value in full precision.  If the value is
-            SQL &lt;code&gt;NULL&lt;/code&gt;, the result is &lt;code&gt;null&lt;/code&gt;.</returns>
+            SQL <c>NULL</c>, the result is <c>null</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -265,10 +267,11 @@
         <param name="parameterIndex">the first parameter is 1, the second is 2,
                    and so on</param>
         <param name="scale">the number of digits to the right of the decimal point</param>
-        <summary>Retrieves the value of the designated JDBC &lt;code&gt;NUMERIC&lt;/code&gt; parameter as a
-            &lt;code&gt;java.</summary>
-        <returns>the parameter value.  If the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the result
-                    is &lt;code&gt;null&lt;/code&gt;.</returns>
+        <summary>Retrieves the value of the designated JDBC <c>NUMERIC</c> parameter as a
+            <c>java.math.BigDecimal</c> object with <i>scale</i> digits to
+            the right of the decimal point.</summary>
+        <returns>the parameter value.  If the value is SQL <c>NULL</c>, the result
+                    is <c>null</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -309,11 +312,11 @@
       </Parameters>
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2, and so on</param>
-        <summary>Retrieves the value of the designated JDBC &lt;code&gt;BLOB&lt;/code&gt; parameter as a
+        <summary>Retrieves the value of the designated JDBC <c>BLOB</c> parameter as a
             <c>java.sql.Blob</c> object in the Java programming language.</summary>
-        <returns>the parameter value as a &lt;code&gt;Blob&lt;/code&gt; object in the
-            Java programming language.  If the value was SQL &lt;code&gt;NULL&lt;/code&gt;, the value
-            &lt;code&gt;null&lt;/code&gt; is returned.</returns>
+        <returns>the parameter value as a <c>Blob</c> object in the
+            Java programming language.  If the value was SQL <c>NULL</c>, the value
+            <c>null</c> is returned.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -355,11 +358,11 @@
       </Parameters>
       <Docs>
         <param name="parameterName">the name of the parameter</param>
-        <summary>Retrieves the value of a JDBC &lt;code&gt;BLOB&lt;/code&gt; parameter as a
+        <summary>Retrieves the value of a JDBC <c>BLOB</c> parameter as a
             <c>java.sql.Blob</c> object in the Java programming language.</summary>
-        <returns>the parameter value as a &lt;code&gt;Blob&lt;/code&gt; object in the
-                    Java programming language.  If the value was SQL &lt;code&gt;NULL&lt;/code&gt;,
-                    the value &lt;code&gt;null&lt;/code&gt; is returned.</returns>
+        <returns>the parameter value as a <c>Blob</c> object in the
+                    Java programming language.  If the value was SQL <c>NULL</c>,
+                    the value <c>null</c> is returned.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -402,11 +405,11 @@
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2,
                    and so on</param>
-        <summary>Retrieves the value of the designated JDBC &lt;code&gt;BIT&lt;/code&gt;
-            or &lt;code&gt;BOOLEAN&lt;/code&gt; parameter as a
-            &lt;code&gt;boolean&lt;/code&gt; in the Java programming language.</summary>
-        <returns>the parameter value.  If the value is SQL &lt;code&gt;NULL&lt;/code&gt;,
-                    the result is &lt;code&gt;false&lt;/code&gt;.</returns>
+        <summary>Retrieves the value of the designated JDBC <c>BIT</c>
+            or <c>BOOLEAN</c> parameter as a
+            <c>boolean</c> in the Java programming language.</summary>
+        <returns>the parameter value.  If the value is SQL <c>NULL</c>,
+                    the result is <c>false</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -448,11 +451,11 @@
       </Parameters>
       <Docs>
         <param name="parameterName">the name of the parameter</param>
-        <summary>Retrieves the value of a JDBC &lt;code&gt;BIT&lt;/code&gt; or &lt;code&gt;BOOLEAN&lt;/code&gt;
+        <summary>Retrieves the value of a JDBC <c>BIT</c> or <c>BOOLEAN</c>
             parameter as a
-            &lt;code&gt;boolean&lt;/code&gt; in the Java programming language.</summary>
-        <returns>the parameter value.  If the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the result
-            is &lt;code&gt;false&lt;/code&gt;.</returns>
+            <c>boolean</c> in the Java programming language.</summary>
+        <returns>the parameter value.  If the value is SQL <c>NULL</c>, the result
+            is <c>false</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -495,10 +498,10 @@
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2,
             and so on</param>
-        <summary>Retrieves the value of the designated JDBC &lt;code&gt;TINYINT&lt;/code&gt; parameter
-            as a &lt;code&gt;byte&lt;/code&gt; in the Java programming language.</summary>
-        <returns>the parameter value.  If the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the result
-            is &lt;code&gt;0&lt;/code&gt;.</returns>
+        <summary>Retrieves the value of the designated JDBC <c>TINYINT</c> parameter
+            as a <c>byte</c> in the Java programming language.</summary>
+        <returns>the parameter value.  If the value is SQL <c>NULL</c>, the result
+            is <c>0</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -540,10 +543,10 @@
       </Parameters>
       <Docs>
         <param name="parameterName">the name of the parameter</param>
-        <summary>Retrieves the value of a JDBC &lt;code&gt;TINYINT&lt;/code&gt; parameter as a &lt;code&gt;byte&lt;/code&gt;
+        <summary>Retrieves the value of a JDBC <c>TINYINT</c> parameter as a <c>byte</c>
             in the Java programming language.</summary>
-        <returns>the parameter value.  If the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the result
-            is &lt;code&gt;0&lt;/code&gt;.</returns>
+        <returns>the parameter value.  If the value is SQL <c>NULL</c>, the result
+            is <c>0</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -586,11 +589,11 @@
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2,
                    and so on</param>
-        <summary>Retrieves the value of the designated JDBC &lt;code&gt;BINARY&lt;/code&gt; or
-            &lt;code&gt;VARBINARY&lt;/code&gt; parameter as an array of &lt;code&gt;byte&lt;/code&gt;
+        <summary>Retrieves the value of the designated JDBC <c>BINARY</c> or
+            <c>VARBINARY</c> parameter as an array of <c>byte</c>
             values in the Java programming language.</summary>
-        <returns>the parameter value.  If the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the result
-                    is &lt;code&gt;null&lt;/code&gt;.</returns>
+        <returns>the parameter value.  If the value is SQL <c>NULL</c>, the result
+                    is <c>null</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -632,11 +635,11 @@
       </Parameters>
       <Docs>
         <param name="parameterName">the name of the parameter</param>
-        <summary>Retrieves the value of a JDBC &lt;code&gt;BINARY&lt;/code&gt; or &lt;code&gt;VARBINARY&lt;/code&gt;
-            parameter as an array of &lt;code&gt;byte&lt;/code&gt; values in the Java
+        <summary>Retrieves the value of a JDBC <c>BINARY</c> or <c>VARBINARY</c>
+            parameter as an array of <c>byte</c> values in the Java
             programming language.</summary>
-        <returns>the parameter value.  If the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the result is
-             &lt;code&gt;null&lt;/code&gt;.</returns>
+        <returns>the parameter value.  If the value is SQL <c>NULL</c>, the result is
+             <c>null</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -679,10 +682,10 @@
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
         <summary>Retrieves the value of the designated parameter as a
-            &lt;code&gt;java.</summary>
-        <returns>a &lt;code&gt;java.io.Reader&lt;/code&gt; object that contains the parameter
-            value; if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the value returned is
-            &lt;code&gt;null&lt;/code&gt; in the Java programming language.</returns>
+            <c>java.io.Reader</c> object in the Java programming language.</summary>
+        <returns>a <c>java.io.Reader</c> object that contains the parameter
+            value; if the value is SQL <c>NULL</c>, the value returned is
+            <c>null</c> in the Java programming language.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -725,10 +728,10 @@
       <Docs>
         <param name="parameterName">the name of the parameter</param>
         <summary>Retrieves the value of the designated parameter as a
-            &lt;code&gt;java.</summary>
-        <returns>a &lt;code&gt;java.io.Reader&lt;/code&gt; object that contains the parameter
-            value; if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the value returned is
-            &lt;code&gt;null&lt;/code&gt; in the Java programming language</returns>
+            <c>java.io.Reader</c> object in the Java programming language.</summary>
+        <returns>a <c>java.io.Reader</c> object that contains the parameter
+            value; if the value is SQL <c>NULL</c>, the value returned is
+            <c>null</c> in the Java programming language</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -771,11 +774,11 @@
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2, and
             so on</param>
-        <summary>Retrieves the value of the designated JDBC &lt;code&gt;CLOB&lt;/code&gt; parameter as a
-            &lt;code&gt;java.</summary>
-        <returns>the parameter value as a &lt;code&gt;Clob&lt;/code&gt; object in the
-            Java programming language.  If the value was SQL &lt;code&gt;NULL&lt;/code&gt;, the
-            value &lt;code&gt;null&lt;/code&gt; is returned.</returns>
+        <summary>Retrieves the value of the designated JDBC <c>CLOB</c> parameter as a
+            <c>java.sql.Clob</c> object in the Java programming language.</summary>
+        <returns>the parameter value as a <c>Clob</c> object in the
+            Java programming language.  If the value was SQL <c>NULL</c>, the
+            value <c>null</c> is returned.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -817,11 +820,11 @@
       </Parameters>
       <Docs>
         <param name="parameterName">the name of the parameter</param>
-        <summary>Retrieves the value of a JDBC &lt;code&gt;CLOB&lt;/code&gt; parameter as a
-            &lt;code&gt;java.</summary>
-        <returns>the parameter value as a &lt;code&gt;Clob&lt;/code&gt; object in the
-                    Java programming language.  If the value was SQL &lt;code&gt;NULL&lt;/code&gt;,
-                    the value &lt;code&gt;null&lt;/code&gt; is returned.</returns>
+        <summary>Retrieves the value of a JDBC <c>CLOB</c> parameter as a
+            <c>java.sql.Clob</c> object in the Java programming language.</summary>
+        <returns>the parameter value as a <c>Clob</c> object in the
+                    Java programming language.  If the value was SQL <c>NULL</c>,
+                    the value <c>null</c> is returned.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -864,10 +867,10 @@
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2,
                    and so on</param>
-        <summary>Retrieves the value of the designated JDBC &lt;code&gt;DATE&lt;/code&gt; parameter as a
-            &lt;code&gt;java.</summary>
-        <returns>the parameter value.  If the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the result
-                    is &lt;code&gt;null&lt;/code&gt;.</returns>
+        <summary>Retrieves the value of the designated JDBC <c>DATE</c> parameter as a
+            <c>java.sql.Date</c> object.</summary>
+        <returns>the parameter value.  If the value is SQL <c>NULL</c>, the result
+                    is <c>null</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -909,10 +912,10 @@
       </Parameters>
       <Docs>
         <param name="parameterName">the name of the parameter</param>
-        <summary>Retrieves the value of a JDBC &lt;code&gt;DATE&lt;/code&gt; parameter as a
-            &lt;code&gt;java.</summary>
-        <returns>the parameter value.  If the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the result
-            is &lt;code&gt;null&lt;/code&gt;.</returns>
+        <summary>Retrieves the value of a JDBC <c>DATE</c> parameter as a
+            <c>java.sql.Date</c> object.</summary>
+        <returns>the parameter value.  If the value is SQL <c>NULL</c>, the result
+            is <c>null</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -956,12 +959,14 @@
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2,
             and so on</param>
-        <param name="cal">the &lt;code&gt;Calendar&lt;/code&gt; object the driver will use
+        <param name="cal">the <c>Calendar</c> object the driver will use
                        to construct the date</param>
-        <summary>Retrieves the value of the designated JDBC &lt;code&gt;DATE&lt;/code&gt; parameter as a
-            &lt;code&gt;java.</summary>
-        <returns>the parameter value.  If the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the result
-                    is &lt;code&gt;null&lt;/code&gt;.</returns>
+        <summary>Retrieves the value of the designated JDBC <c>DATE</c> parameter as a
+            <c>java.sql.Date</c> object, using
+            the given <c>Calendar</c> object
+            to construct the date.</summary>
+        <returns>the parameter value.  If the value is SQL <c>NULL</c>, the result
+                    is <c>null</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1004,12 +1009,14 @@
       </Parameters>
       <Docs>
         <param name="parameterName">the name of the parameter</param>
-        <param name="cal">the &lt;code&gt;Calendar&lt;/code&gt; object the driver will use
+        <param name="cal">the <c>Calendar</c> object the driver will use
                        to construct the date</param>
-        <summary>Retrieves the value of a JDBC &lt;code&gt;DATE&lt;/code&gt; parameter as a
-            &lt;code&gt;java.</summary>
-        <returns>the parameter value.  If the value is SQL &lt;code&gt;NULL&lt;/code&gt;,
-            the result is &lt;code&gt;null&lt;/code&gt;.</returns>
+        <summary>Retrieves the value of a JDBC <c>DATE</c> parameter as a
+            <c>java.sql.Date</c> object, using
+            the given <c>Calendar</c> object
+            to construct the date.</summary>
+        <returns>the parameter value.  If the value is SQL <c>NULL</c>,
+            the result is <c>null</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1052,10 +1059,10 @@
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2,
                    and so on</param>
-        <summary>Retrieves the value of the designated JDBC &lt;code&gt;DOUBLE&lt;/code&gt; parameter as a &lt;code&gt;double&lt;/code&gt;
+        <summary>Retrieves the value of the designated JDBC <c>DOUBLE</c> parameter as a <c>double</c>
             in the Java programming language.</summary>
-        <returns>the parameter value.  If the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the result
-                    is &lt;code&gt;0&lt;/code&gt;.</returns>
+        <returns>the parameter value.  If the value is SQL <c>NULL</c>, the result
+                    is <c>0</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1097,10 +1104,10 @@
       </Parameters>
       <Docs>
         <param name="parameterName">the name of the parameter</param>
-        <summary>Retrieves the value of a JDBC &lt;code&gt;DOUBLE&lt;/code&gt; parameter as a &lt;code&gt;double&lt;/code&gt;
+        <summary>Retrieves the value of a JDBC <c>DOUBLE</c> parameter as a <c>double</c>
             in the Java programming language.</summary>
-        <returns>the parameter value.  If the value is SQL &lt;code&gt;NULL&lt;/code&gt;,
-                    the result is &lt;code&gt;0&lt;/code&gt;.</returns>
+        <returns>the parameter value.  If the value is SQL <c>NULL</c>,
+                    the result is <c>0</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1143,10 +1150,10 @@
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2,
                    and so on</param>
-        <summary>Retrieves the value of the designated JDBC &lt;code&gt;FLOAT&lt;/code&gt; parameter
-            as a &lt;code&gt;float&lt;/code&gt; in the Java programming language.</summary>
-        <returns>the parameter value.  If the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the result
-                    is &lt;code&gt;0&lt;/code&gt;.</returns>
+        <summary>Retrieves the value of the designated JDBC <c>FLOAT</c> parameter
+            as a <c>float</c> in the Java programming language.</summary>
+        <returns>the parameter value.  If the value is SQL <c>NULL</c>, the result
+                    is <c>0</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1188,10 +1195,10 @@
       </Parameters>
       <Docs>
         <param name="parameterName">the name of the parameter</param>
-        <summary>Retrieves the value of a JDBC &lt;code&gt;FLOAT&lt;/code&gt; parameter as a &lt;code&gt;float&lt;/code&gt;
+        <summary>Retrieves the value of a JDBC <c>FLOAT</c> parameter as a <c>float</c>
             in the Java programming language.</summary>
-        <returns>the parameter value.  If the value is SQL &lt;code&gt;NULL&lt;/code&gt;,
-                    the result is &lt;code&gt;0&lt;/code&gt;.</returns>
+        <returns>the parameter value.  If the value is SQL <c>NULL</c>,
+                    the result is <c>0</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1234,10 +1241,10 @@
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2,
             and so on</param>
-        <summary>Retrieves the value of the designated JDBC &lt;code&gt;INTEGER&lt;/code&gt; parameter
-            as an &lt;code&gt;int&lt;/code&gt; in the Java programming language.</summary>
-        <returns>the parameter value.  If the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the result
-            is &lt;code&gt;0&lt;/code&gt;.</returns>
+        <summary>Retrieves the value of the designated JDBC <c>INTEGER</c> parameter
+            as an <c>int</c> in the Java programming language.</summary>
+        <returns>the parameter value.  If the value is SQL <c>NULL</c>, the result
+            is <c>0</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1279,10 +1286,10 @@
       </Parameters>
       <Docs>
         <param name="parameterName">the name of the parameter</param>
-        <summary>Retrieves the value of a JDBC &lt;code&gt;INTEGER&lt;/code&gt; parameter as an &lt;code&gt;int&lt;/code&gt;
+        <summary>Retrieves the value of a JDBC <c>INTEGER</c> parameter as an <c>int</c>
             in the Java programming language.</summary>
-        <returns>the parameter value.  If the value is SQL &lt;code&gt;NULL&lt;/code&gt;,
-                    the result is &lt;code&gt;0&lt;/code&gt;.</returns>
+        <returns>the parameter value.  If the value is SQL <c>NULL</c>,
+                    the result is <c>0</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1325,10 +1332,10 @@
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2,
             and so on</param>
-        <summary>Retrieves the value of the designated JDBC &lt;code&gt;BIGINT&lt;/code&gt; parameter
-            as a &lt;code&gt;long&lt;/code&gt; in the Java programming language.</summary>
-        <returns>the parameter value.  If the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the result
-            is &lt;code&gt;0&lt;/code&gt;.</returns>
+        <summary>Retrieves the value of the designated JDBC <c>BIGINT</c> parameter
+            as a <c>long</c> in the Java programming language.</summary>
+        <returns>the parameter value.  If the value is SQL <c>NULL</c>, the result
+            is <c>0</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1370,10 +1377,10 @@
       </Parameters>
       <Docs>
         <param name="parameterName">the name of the parameter</param>
-        <summary>Retrieves the value of a JDBC &lt;code&gt;BIGINT&lt;/code&gt; parameter as a &lt;code&gt;long&lt;/code&gt;
+        <summary>Retrieves the value of a JDBC <c>BIGINT</c> parameter as a <c>long</c>
             in the Java programming language.</summary>
-        <returns>the parameter value.  If the value is SQL &lt;code&gt;NULL&lt;/code&gt;,
-                    the result is &lt;code&gt;0&lt;/code&gt;.</returns>
+        <returns>the parameter value.  If the value is SQL <c>NULL</c>,
+                    the result is <c>0</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1416,10 +1423,10 @@
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
         <summary>Retrieves the value of the designated parameter as a
-            &lt;code&gt;java.</summary>
-        <returns>a &lt;code&gt;java.io.Reader&lt;/code&gt; object that contains the parameter
-            value; if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the value returned is
-            &lt;code&gt;null&lt;/code&gt; in the Java programming language.</returns>
+            <c>java.io.Reader</c> object in the Java programming language.</summary>
+        <returns>a <c>java.io.Reader</c> object that contains the parameter
+            value; if the value is SQL <c>NULL</c>, the value returned is
+            <c>null</c> in the Java programming language.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1462,10 +1469,10 @@
       <Docs>
         <param name="parameterName">the name of the parameter</param>
         <summary>Retrieves the value of the designated parameter as a
-            &lt;code&gt;java.</summary>
-        <returns>a &lt;code&gt;java.io.Reader&lt;/code&gt; object that contains the parameter
-            value; if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the value returned is
-            &lt;code&gt;null&lt;/code&gt; in the Java programming language</returns>
+            <c>java.io.Reader</c> object in the Java programming language.</summary>
+        <returns>a <c>java.io.Reader</c> object that contains the parameter
+            value; if the value is SQL <c>NULL</c>, the value returned is
+            <c>null</c> in the Java programming language</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1508,11 +1515,11 @@
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2, and
             so on</param>
-        <summary>Retrieves the value of the designated JDBC &lt;code&gt;NCLOB&lt;/code&gt; parameter as a
-            &lt;code&gt;java.</summary>
-        <returns>the parameter value as a &lt;code&gt;NClob&lt;/code&gt; object in the
-            Java programming language.  If the value was SQL &lt;code&gt;NULL&lt;/code&gt;, the
-            value &lt;code&gt;null&lt;/code&gt; is returned.</returns>
+        <summary>Retrieves the value of the designated JDBC <c>NCLOB</c> parameter as a
+            <c>java.sql.NClob</c> object in the Java programming language.</summary>
+        <returns>the parameter value as a <c>NClob</c> object in the
+            Java programming language.  If the value was SQL <c>NULL</c>, the
+            value <c>null</c> is returned.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1554,11 +1561,11 @@
       </Parameters>
       <Docs>
         <param name="parameterName">the name of the parameter</param>
-        <summary>Retrieves the value of a JDBC &lt;code&gt;NCLOB&lt;/code&gt; parameter as a
-            &lt;code&gt;java.</summary>
-        <returns>the parameter value as a &lt;code&gt;NClob&lt;/code&gt; object in the
-                    Java programming language.  If the value was SQL &lt;code&gt;NULL&lt;/code&gt;,
-                    the value &lt;code&gt;null&lt;/code&gt; is returned.</returns>
+        <summary>Retrieves the value of a JDBC <c>NCLOB</c> parameter as a
+            <c>java.sql.NClob</c> object in the Java programming language.</summary>
+        <returns>the parameter value as a <c>NClob</c> object in the
+                    Java programming language.  If the value was SQL <c>NULL</c>,
+                    the value <c>null</c> is returned.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1600,12 +1607,12 @@
       </Parameters>
       <Docs>
         <param name="parameterIndex">index of the first parameter is 1, the second is 2, ...</param>
-        <summary>Retrieves the value of the designated &lt;code&gt;NCHAR&lt;/code&gt;,
-            &lt;code&gt;NVARCHAR&lt;/code&gt;
-            or &lt;code&gt;LONGNVARCHAR&lt;/code&gt; parameter as
-            a &lt;code&gt;String&lt;/code&gt; in the Java programming language.</summary>
-        <returns>a &lt;code&gt;String&lt;/code&gt; object that maps an
-            &lt;code&gt;NCHAR&lt;/code&gt;, &lt;code&gt;NVARCHAR&lt;/code&gt; or &lt;code&gt;LONGNVARCHAR&lt;/code&gt; value</returns>
+        <summary>Retrieves the value of the designated <c>NCHAR</c>,
+            <c>NVARCHAR</c>
+            or <c>LONGNVARCHAR</c> parameter as
+            a <c>String</c> in the Java programming language.</summary>
+        <returns>a <c>String</c> object that maps an
+            <c>NCHAR</c>, <c>NVARCHAR</c> or <c>LONGNVARCHAR</c> value</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1647,12 +1654,12 @@
       </Parameters>
       <Docs>
         <param name="parameterName">the name of the parameter</param>
-        <summary>Retrieves the value of the designated &lt;code&gt;NCHAR&lt;/code&gt;,
-            &lt;code&gt;NVARCHAR&lt;/code&gt;
-            or &lt;code&gt;LONGNVARCHAR&lt;/code&gt; parameter as
-            a &lt;code&gt;String&lt;/code&gt; in the Java programming language.</summary>
-        <returns>a &lt;code&gt;String&lt;/code&gt; object that maps an
-            &lt;code&gt;NCHAR&lt;/code&gt;, &lt;code&gt;NVARCHAR&lt;/code&gt; or &lt;code&gt;LONGNVARCHAR&lt;/code&gt; value</returns>
+        <summary>Retrieves the value of the designated <c>NCHAR</c>,
+            <c>NVARCHAR</c>
+            or <c>LONGNVARCHAR</c> parameter as
+            a <c>String</c> in the Java programming language.</summary>
+        <returns>a <c>String</c> object that maps an
+            <c>NCHAR</c>, <c>NVARCHAR</c> or <c>LONGNVARCHAR</c> value</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1695,9 +1702,9 @@
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2,
                    and so on</param>
-        <summary>Retrieves the value of the designated parameter as an &lt;code&gt;Object&lt;/code&gt;
+        <summary>Retrieves the value of the designated parameter as an <c>Object</c>
             in the Java programming language.</summary>
-        <returns>A &lt;code&gt;java.lang.Object&lt;/code&gt; holding the OUT parameter value</returns>
+        <returns>A <c>java.lang.Object</c> holding the OUT parameter value</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1739,9 +1746,9 @@
       </Parameters>
       <Docs>
         <param name="parameterName">the name of the parameter</param>
-        <summary>Retrieves the value of a parameter as an &lt;code&gt;Object&lt;/code&gt; in the Java
+        <summary>Retrieves the value of a parameter as an <c>Object</c> in the Java
             programming language.</summary>
-        <returns>A &lt;code&gt;java.lang.Object&lt;/code&gt; holding the OUT parameter value.</returns>
+        <returns>A <c>java.lang.Object</c> holding the OUT parameter value.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1786,9 +1793,9 @@
         <param name="parameterIndex">the first parameter is 1, the second is 2, and so on</param>
         <param name="map">the mapping from SQL type names to Java classes</param>
         <summary>Returns an object representing the value of OUT parameter
-            &lt;code&gt;parameterIndex&lt;/code&gt; and uses &lt;code&gt;map&lt;/code&gt; for the custom
+            <c>parameterIndex</c> and uses <c>map</c> for the custom
             mapping of the parameter value.</summary>
-        <returns>a &lt;code&gt;java.lang.Object&lt;/code&gt; holding the OUT parameter value</returns>
+        <returns>a <c>java.lang.Object</c> holding the OUT parameter value</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1830,9 +1837,9 @@
         <param name="parameterName">the name of the parameter</param>
         <param name="map">the mapping from SQL type names to Java classes</param>
         <summary>Returns an object representing the value of OUT parameter
-            &lt;code&gt;parameterName&lt;/code&gt; and uses &lt;code&gt;map&lt;/code&gt; for the custom
+            <c>parameterName</c> and uses <c>map</c> for the custom
             mapping of the parameter value.</summary>
-        <returns>a &lt;code&gt;java.lang.Object&lt;/code&gt; holding the OUT parameter value</returns>
+        <returns>a <c>java.lang.Object</c> holding the OUT parameter value</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1872,11 +1879,11 @@
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2,
             and so on</param>
-        <summary>Retrieves the value of the designated JDBC &lt;code&gt;REF(&amp;lt;structured-type&amp;gt;)&lt;/code&gt;
+        <summary>Retrieves the value of the designated JDBC <c>REF(&amp;lt;structured-type&amp;gt;)</c>
             parameter as a <c>java.sql.Ref</c> object in the Java programming language.</summary>
-        <returns>the parameter value as a &lt;code&gt;Ref&lt;/code&gt; object in the
-            Java programming language.  If the value was SQL &lt;code&gt;NULL&lt;/code&gt;, the value
-            &lt;code&gt;null&lt;/code&gt; is returned.</returns>
+        <returns>the parameter value as a <c>Ref</c> object in the
+            Java programming language.  If the value was SQL <c>NULL</c>, the value
+            <c>null</c> is returned.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1918,11 +1925,11 @@
       </Parameters>
       <Docs>
         <param name="parameterName">the name of the parameter</param>
-        <summary>Retrieves the value of a JDBC &lt;code&gt;REF(&amp;lt;structured-type&amp;gt;)&lt;/code&gt;
+        <summary>Retrieves the value of a JDBC <c>REF(&amp;lt;structured-type&amp;gt;)</c>
             parameter as a <c>java.sql.Ref</c> object in the Java programming language.</summary>
-        <returns>the parameter value as a &lt;code&gt;Ref&lt;/code&gt; object in the
-                    Java programming language.  If the value was SQL &lt;code&gt;NULL&lt;/code&gt;,
-                    the value &lt;code&gt;null&lt;/code&gt; is returned.</returns>
+        <returns>the parameter value as a <c>Ref</c> object in the
+                    Java programming language.  If the value was SQL <c>NULL</c>,
+                    the value <c>null</c> is returned.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1964,11 +1971,11 @@
       </Parameters>
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2,...</param>
-        <summary>Retrieves the value of the designated JDBC &lt;code&gt;ROWID&lt;/code&gt; parameter as a
-            &lt;code&gt;java.</summary>
-        <returns>a &lt;code&gt;RowId&lt;/code&gt; object that represents the JDBC &lt;code&gt;ROWID&lt;/code&gt;
+        <summary>Retrieves the value of the designated JDBC <c>ROWID</c> parameter as a
+            <c>java.sql.RowId</c> object.</summary>
+        <returns>a <c>RowId</c> object that represents the JDBC <c>ROWID</c>
                 value is used as the designated parameter. If the parameter contains
-            a SQL &lt;code&gt;NULL&lt;/code&gt;, then a &lt;code&gt;null&lt;/code&gt; value is returned.</returns>
+            a SQL <c>NULL</c>, then a <c>null</c> value is returned.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -2010,11 +2017,11 @@
       </Parameters>
       <Docs>
         <param name="parameterName">the name of the parameter</param>
-        <summary>Retrieves the value of the designated JDBC &lt;code&gt;ROWID&lt;/code&gt; parameter as a
-            &lt;code&gt;java.</summary>
-        <returns>a &lt;code&gt;RowId&lt;/code&gt; object that represents the JDBC &lt;code&gt;ROWID&lt;/code&gt;
+        <summary>Retrieves the value of the designated JDBC <c>ROWID</c> parameter as a
+            <c>java.sql.RowId</c> object.</summary>
+        <returns>a <c>RowId</c> object that represents the JDBC <c>ROWID</c>
                 value is used as the designated parameter. If the parameter contains
-            a SQL &lt;code&gt;NULL&lt;/code&gt;, then a &lt;code&gt;null&lt;/code&gt; value is returned.</returns>
+            a SQL <c>NULL</c>, then a <c>null</c> value is returned.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -2057,10 +2064,10 @@
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2,
             and so on</param>
-        <summary>Retrieves the value of the designated JDBC &lt;code&gt;SMALLINT&lt;/code&gt; parameter
-            as a &lt;code&gt;short&lt;/code&gt; in the Java programming language.</summary>
-        <returns>the parameter value.  If the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the result
-            is &lt;code&gt;0&lt;/code&gt;.</returns>
+        <summary>Retrieves the value of the designated JDBC <c>SMALLINT</c> parameter
+            as a <c>short</c> in the Java programming language.</summary>
+        <returns>the parameter value.  If the value is SQL <c>NULL</c>, the result
+            is <c>0</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -2102,10 +2109,10 @@
       </Parameters>
       <Docs>
         <param name="parameterName">the name of the parameter</param>
-        <summary>Retrieves the value of a JDBC &lt;code&gt;SMALLINT&lt;/code&gt; parameter as a &lt;code&gt;short&lt;/code&gt;
+        <summary>Retrieves the value of a JDBC <c>SMALLINT</c> parameter as a <c>short</c>
             in the Java programming language.</summary>
-        <returns>the parameter value.  If the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the result
-            is &lt;code&gt;0&lt;/code&gt;.</returns>
+        <returns>the parameter value.  If the value is SQL <c>NULL</c>, the result
+            is <c>0</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -2147,9 +2154,9 @@
       </Parameters>
       <Docs>
         <param name="parameterIndex">index of the first parameter is 1, the second is 2, ...</param>
-        <summary>Retrieves the value of the designated &lt;code&gt;SQL XML&lt;/code&gt; parameter as a
-            &lt;code&gt;java.</summary>
-        <returns>a &lt;code&gt;SQLXML&lt;/code&gt; object that maps an &lt;code&gt;SQL XML&lt;/code&gt; value</returns>
+        <summary>Retrieves the value of the designated <c>SQL XML</c> parameter as a
+            <c>java.sql.SQLXML</c> object in the Java programming language.</summary>
+        <returns>a <c>SQLXML</c> object that maps an <c>SQL XML</c> value</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -2191,9 +2198,9 @@
       </Parameters>
       <Docs>
         <param name="parameterName">the name of the parameter</param>
-        <summary>Retrieves the value of the designated &lt;code&gt;SQL XML&lt;/code&gt; parameter as a
-            &lt;code&gt;java.</summary>
-        <returns>a &lt;code&gt;SQLXML&lt;/code&gt; object that maps an &lt;code&gt;SQL XML&lt;/code&gt; value</returns>
+        <summary>Retrieves the value of the designated <c>SQL XML</c> parameter as a
+            <c>java.sql.SQLXML</c> object in the Java programming language.</summary>
+        <returns>a <c>SQLXML</c> object that maps an <c>SQL XML</c> value</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -2236,12 +2243,12 @@
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2,
             and so on</param>
-        <summary>Retrieves the value of the designated JDBC &lt;code&gt;CHAR&lt;/code&gt;,
-            &lt;code&gt;VARCHAR&lt;/code&gt;, or &lt;code&gt;LONGVARCHAR&lt;/code&gt; parameter as a
-            &lt;code&gt;String&lt;/code&gt; in the Java programming language.</summary>
-        <returns>the parameter value. If the value is SQL &lt;code&gt;NULL&lt;/code&gt;,
+        <summary>Retrieves the value of the designated JDBC <c>CHAR</c>,
+            <c>VARCHAR</c>, or <c>LONGVARCHAR</c> parameter as a
+            <c>String</c> in the Java programming language.</summary>
+        <returns>the parameter value. If the value is SQL <c>NULL</c>,
                     the result
-                    is &lt;code&gt;null&lt;/code&gt;.</returns>
+                    is <c>null</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -2283,11 +2290,11 @@
       </Parameters>
       <Docs>
         <param name="parameterName">the name of the parameter</param>
-        <summary>Retrieves the value of a JDBC &lt;code&gt;CHAR&lt;/code&gt;, &lt;code&gt;VARCHAR&lt;/code&gt;,
-            or &lt;code&gt;LONGVARCHAR&lt;/code&gt; parameter as a &lt;code&gt;String&lt;/code&gt; in
+        <summary>Retrieves the value of a JDBC <c>CHAR</c>, <c>VARCHAR</c>,
+            or <c>LONGVARCHAR</c> parameter as a <c>String</c> in
             the Java programming language.</summary>
-        <returns>the parameter value. If the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the result
-            is &lt;code&gt;null&lt;/code&gt;.</returns>
+        <returns>the parameter value. If the value is SQL <c>NULL</c>, the result
+            is <c>null</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -2330,10 +2337,10 @@
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2,
                    and so on</param>
-        <summary>Retrieves the value of the designated JDBC &lt;code&gt;TIME&lt;/code&gt; parameter as a
-            &lt;code&gt;java.</summary>
-        <returns>the parameter value.  If the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the result
-                    is &lt;code&gt;null&lt;/code&gt;.</returns>
+        <summary>Retrieves the value of the designated JDBC <c>TIME</c> parameter as a
+            <c>java.sql.Time</c> object.</summary>
+        <returns>the parameter value.  If the value is SQL <c>NULL</c>, the result
+                    is <c>null</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -2375,10 +2382,10 @@
       </Parameters>
       <Docs>
         <param name="parameterName">the name of the parameter</param>
-        <summary>Retrieves the value of a JDBC &lt;code&gt;TIME&lt;/code&gt; parameter as a
-            &lt;code&gt;java.</summary>
-        <returns>the parameter value.  If the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the result
-            is &lt;code&gt;null&lt;/code&gt;.</returns>
+        <summary>Retrieves the value of a JDBC <c>TIME</c> parameter as a
+            <c>java.sql.Time</c> object.</summary>
+        <returns>the parameter value.  If the value is SQL <c>NULL</c>, the result
+            is <c>null</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -2422,12 +2429,14 @@
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2,
             and so on</param>
-        <param name="cal">the &lt;code&gt;Calendar&lt;/code&gt; object the driver will use
+        <param name="cal">the <c>Calendar</c> object the driver will use
                        to construct the time</param>
-        <summary>Retrieves the value of the designated JDBC &lt;code&gt;TIME&lt;/code&gt; parameter as a
-            &lt;code&gt;java.</summary>
-        <returns>the parameter value; if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the result
-                    is &lt;code&gt;null&lt;/code&gt;.</returns>
+        <summary>Retrieves the value of the designated JDBC <c>TIME</c> parameter as a
+            <c>java.sql.Time</c> object, using
+            the given <c>Calendar</c> object
+            to construct the time.</summary>
+        <returns>the parameter value; if the value is SQL <c>NULL</c>, the result
+                    is <c>null</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -2471,12 +2480,14 @@
       </Parameters>
       <Docs>
         <param name="parameterName">the name of the parameter</param>
-        <param name="cal">the &lt;code&gt;Calendar&lt;/code&gt; object the driver will use
+        <param name="cal">the <c>Calendar</c> object the driver will use
                        to construct the time</param>
-        <summary>Retrieves the value of a JDBC &lt;code&gt;TIME&lt;/code&gt; parameter as a
-            &lt;code&gt;java.</summary>
-        <returns>the parameter value; if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the result is
-            &lt;code&gt;null&lt;/code&gt;.</returns>
+        <summary>Retrieves the value of a JDBC <c>TIME</c> parameter as a
+            <c>java.sql.Time</c> object, using
+            the given <c>Calendar</c> object
+            to construct the time.</summary>
+        <returns>the parameter value; if the value is SQL <c>NULL</c>, the result is
+            <c>null</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -2520,10 +2531,10 @@
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2,
                    and so on</param>
-        <summary>Retrieves the value of the designated JDBC &lt;code&gt;TIMESTAMP&lt;/code&gt; parameter as a
-            &lt;code&gt;java.</summary>
-        <returns>the parameter value.  If the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the result
-                    is &lt;code&gt;null&lt;/code&gt;.</returns>
+        <summary>Retrieves the value of the designated JDBC <c>TIMESTAMP</c> parameter as a
+            <c>java.sql.Timestamp</c> object.</summary>
+        <returns>the parameter value.  If the value is SQL <c>NULL</c>, the result
+                    is <c>null</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -2565,10 +2576,10 @@
       </Parameters>
       <Docs>
         <param name="parameterName">the name of the parameter</param>
-        <summary>Retrieves the value of a JDBC &lt;code&gt;TIMESTAMP&lt;/code&gt; parameter as a
-            &lt;code&gt;java.</summary>
-        <returns>the parameter value.  If the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the result
-            is &lt;code&gt;null&lt;/code&gt;.</returns>
+        <summary>Retrieves the value of a JDBC <c>TIMESTAMP</c> parameter as a
+            <c>java.sql.Timestamp</c> object.</summary>
+        <returns>the parameter value.  If the value is SQL <c>NULL</c>, the result
+            is <c>null</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -2612,12 +2623,14 @@
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2,
             and so on</param>
-        <param name="cal">the &lt;code&gt;Calendar&lt;/code&gt; object the driver will use
+        <param name="cal">the <c>Calendar</c> object the driver will use
                        to construct the timestamp</param>
-        <summary>Retrieves the value of the designated JDBC &lt;code&gt;TIMESTAMP&lt;/code&gt; parameter as a
-            &lt;code&gt;java.</summary>
-        <returns>the parameter value.  If the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the result
-                    is &lt;code&gt;null&lt;/code&gt;.</returns>
+        <summary>Retrieves the value of the designated JDBC <c>TIMESTAMP</c> parameter as a
+            <c>java.sql.Timestamp</c> object, using
+            the given <c>Calendar</c> object to construct
+            the <c>Timestamp</c> object.</summary>
+        <returns>the parameter value.  If the value is SQL <c>NULL</c>, the result
+                    is <c>null</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -2660,12 +2673,14 @@
       </Parameters>
       <Docs>
         <param name="parameterName">the name of the parameter</param>
-        <param name="cal">the &lt;code&gt;Calendar&lt;/code&gt; object the driver will use
+        <param name="cal">the <c>Calendar</c> object the driver will use
                        to construct the timestamp</param>
-        <summary>Retrieves the value of a JDBC &lt;code&gt;TIMESTAMP&lt;/code&gt; parameter as a
-            &lt;code&gt;java.</summary>
-        <returns>the parameter value.  If the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the result is
-            &lt;code&gt;null&lt;/code&gt;.</returns>
+        <summary>Retrieves the value of a JDBC <c>TIMESTAMP</c> parameter as a
+            <c>java.sql.Timestamp</c> object, using
+            the given <c>Calendar</c> object to construct
+            the <c>Timestamp</c> object.</summary>
+        <returns>the parameter value.  If the value is SQL <c>NULL</c>, the result is
+            <c>null</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -2707,10 +2722,10 @@
       </Parameters>
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2,...</param>
-        <summary>Retrieves the value of the designated JDBC &lt;code&gt;DATALINK&lt;/code&gt; parameter as a
-            &lt;code&gt;java.</summary>
-        <returns>a &lt;code&gt;java.net.URL&lt;/code&gt; object that represents the
-                    JDBC &lt;code&gt;DATALINK&lt;/code&gt; value used as the designated
+        <summary>Retrieves the value of the designated JDBC <c>DATALINK</c> parameter as a
+            <c>java.net.URL</c> object.</summary>
+        <returns>a <c>java.net.URL</c> object that represents the
+                    JDBC <c>DATALINK</c> value used as the designated
                     parameter</returns>
         <remarks>
           <para>
@@ -2753,11 +2768,11 @@
       </Parameters>
       <Docs>
         <param name="parameterName">the name of the parameter</param>
-        <summary>Retrieves the value of a JDBC &lt;code&gt;DATALINK&lt;/code&gt; parameter as a
-            &lt;code&gt;java.</summary>
-        <returns>the parameter value as a &lt;code&gt;java.net.URL&lt;/code&gt; object in the
-            Java programming language.  If the value was SQL &lt;code&gt;NULL&lt;/code&gt;, the
-            value &lt;code&gt;null&lt;/code&gt; is returned.</returns>
+        <summary>Retrieves the value of a JDBC <c>DATALINK</c> parameter as a
+            <c>java.net.URL</c> object.</summary>
+        <returns>the parameter value as a <c>java.net.URL</c> object in the
+            Java programming language.  If the value was SQL <c>NULL</c>, the
+            value <c>null</c> is returned.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -2801,14 +2816,14 @@
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2,
                    and so on</param>
-        <param name="sqlType">the JDBC type code defined by &lt;code&gt;java.sql.Types&lt;/code&gt;.
-                   If the parameter is of JDBC type &lt;code&gt;NUMERIC&lt;/code&gt;
-                   or &lt;code&gt;DECIMAL&lt;/code&gt;, the version of
-                   &lt;code&gt;registerOutParameter&lt;/code&gt; that accepts a scale value
+        <param name="sqlType">the JDBC type code defined by <c>java.sql.Types</c>.
+                   If the parameter is of JDBC type <c>NUMERIC</c>
+                   or <c>DECIMAL</c>, the version of
+                   <c>registerOutParameter</c> that accepts a scale value
                    should be used.</param>
         <summary>Registers the OUT parameter in ordinal position
-            &lt;code&gt;parameterIndex&lt;/code&gt; to the JDBC type
-            &lt;code&gt;sqlType&lt;/code&gt;.</summary>
+            <c>parameterIndex</c> to the JDBC type
+            <c>sqlType</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -2851,14 +2866,14 @@
       </Parameters>
       <Docs>
         <param name="parameterName">the name of the parameter</param>
-        <param name="sqlType">the JDBC type code defined by &lt;code&gt;java.sql.Types&lt;/code&gt;.
-            If the parameter is of JDBC type &lt;code&gt;NUMERIC&lt;/code&gt;
-            or &lt;code&gt;DECIMAL&lt;/code&gt;, the version of
-            &lt;code&gt;registerOutParameter&lt;/code&gt; that accepts a scale value
+        <param name="sqlType">the JDBC type code defined by <c>java.sql.Types</c>.
+            If the parameter is of JDBC type <c>NUMERIC</c>
+            or <c>DECIMAL</c>, the version of
+            <c>registerOutParameter</c> that accepts a scale value
             should be used.</param>
         <summary>Registers the OUT parameter named
-            &lt;code&gt;parameterName&lt;/code&gt; to the JDBC type
-            &lt;code&gt;sqlType&lt;/code&gt;.</summary>
+            <c>parameterName</c> to the JDBC type
+            <c>sqlType</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -2903,12 +2918,12 @@
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2,
             and so on</param>
-        <param name="sqlType">the SQL type code defined by &lt;code&gt;java.sql.Types&lt;/code&gt;.</param>
+        <param name="sqlType">the SQL type code defined by <c>java.sql.Types</c>.</param>
         <param name="scale">the desired number of digits to the right of the
             decimal point.  It must be greater than or equal to zero.</param>
         <summary>Registers the parameter in ordinal position
-            &lt;code&gt;parameterIndex&lt;/code&gt; to be of JDBC type
-            &lt;code&gt;sqlType&lt;/code&gt;.</summary>
+            <c>parameterIndex</c> to be of JDBC type
+            <c>sqlType</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -2998,12 +3013,12 @@
       </Parameters>
       <Docs>
         <param name="parameterName">the name of the parameter</param>
-        <param name="sqlType">SQL type code defined by &lt;code&gt;java.sql.Types&lt;/code&gt;.</param>
+        <param name="sqlType">SQL type code defined by <c>java.sql.Types</c>.</param>
         <param name="scale">the desired number of digits to the right of the
             decimal point.  It must be greater than or equal to zero.</param>
         <summary>Registers the parameter named
-            &lt;code&gt;parameterName&lt;/code&gt; to be of JDBC type
-            &lt;code&gt;sqlType&lt;/code&gt;.</summary>
+            <c>parameterName</c> to be of JDBC type
+            <c>sqlType</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -3232,7 +3247,7 @@
         <param name="parameterName">the name of the parameter</param>
         <param name="x">the parameter value</param>
         <summary>Sets the designated parameter to the given
-            &lt;code&gt;java.</summary>
+            <c>java.math.BigDecimal</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -3413,8 +3428,8 @@
       </Parameters>
       <Docs>
         <param name="parameterName">the name of the parameter</param>
-        <param name="x">a &lt;code&gt;Blob&lt;/code&gt; object that maps an SQL &lt;code&gt;BLOB&lt;/code&gt; value</param>
-        <summary>Sets the designated parameter to the given &lt;code&gt;java.</summary>
+        <param name="x">a <c>Blob</c> object that maps an SQL <c>BLOB</c> value</param>
+        <summary>Sets the designated parameter to the given <c>java.sql.Blob</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -3459,7 +3474,7 @@
         <param name="parameterName">the name of the parameter</param>
         <param name="inputStream">An object that contains the data to set the parameter
             value to.</param>
-        <summary>Sets the designated parameter to a &lt;code&gt;InputStream&lt;/code&gt; object.</summary>
+        <summary>Sets the designated parameter to a <c>InputStream</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -3507,7 +3522,7 @@
         <param name="inputStream">An object that contains the data to set the parameter
             value to.</param>
         <param name="length">the number of bytes in the parameter data.</param>
-        <summary>Sets the designated parameter to a &lt;code&gt;InputStream&lt;/code&gt; object.</summary>
+        <summary>Sets the designated parameter to a <c>InputStream</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -3551,7 +3566,7 @@
       <Docs>
         <param name="parameterName">the name of the parameter</param>
         <param name="x">the parameter value</param>
-        <summary>Sets the designated parameter to the given Java &lt;code&gt;boolean&lt;/code&gt; value.</summary>
+        <summary>Sets the designated parameter to the given Java <c>boolean</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -3595,7 +3610,7 @@
       <Docs>
         <param name="parameterName">the name of the parameter</param>
         <param name="x">the parameter value</param>
-        <summary>Sets the designated parameter to the given Java &lt;code&gt;byte&lt;/code&gt; value.</summary>
+        <summary>Sets the designated parameter to the given Java <c>byte</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -3682,9 +3697,9 @@
       </Parameters>
       <Docs>
         <param name="parameterName">the name of the parameter</param>
-        <param name="reader">the &lt;code&gt;java.io.Reader&lt;/code&gt; object that contains the
+        <param name="reader">the <c>java.io.Reader</c> object that contains the
                    Unicode data</param>
-        <summary>Sets the designated parameter to the given &lt;code&gt;Reader&lt;/code&gt;
+        <summary>Sets the designated parameter to the given <c>Reader</c>
             object.</summary>
         <remarks>
           <para>
@@ -3729,10 +3744,10 @@
       </Parameters>
       <Docs>
         <param name="parameterName">the name of the parameter</param>
-        <param name="reader">the &lt;code&gt;java.io.Reader&lt;/code&gt; object that
+        <param name="reader">the <c>java.io.Reader</c> object that
                    contains the UNICODE data used as the designated parameter</param>
         <param name="length">the number of characters in the stream</param>
-        <summary>Sets the designated parameter to the given &lt;code&gt;Reader&lt;/code&gt;
+        <summary>Sets the designated parameter to the given <c>Reader</c>
             object, which is the given number of characters long.</summary>
         <remarks>
           <para>
@@ -3777,10 +3792,10 @@
       </Parameters>
       <Docs>
         <param name="parameterName">the name of the parameter</param>
-        <param name="reader">the &lt;code&gt;java.io.Reader&lt;/code&gt; object that
+        <param name="reader">the <c>java.io.Reader</c> object that
                    contains the UNICODE data used as the designated parameter</param>
         <param name="length">the number of characters in the stream</param>
-        <summary>Sets the designated parameter to the given &lt;code&gt;Reader&lt;/code&gt;
+        <summary>Sets the designated parameter to the given <c>Reader</c>
             object, which is the given number of characters long.</summary>
         <remarks>
           <para>
@@ -3825,7 +3840,7 @@
       <Docs>
         <param name="parameterName">the name of the parameter</param>
         <param name="reader">An object that contains the data to set the parameter value to.</param>
-        <summary>Sets the designated parameter to a &lt;code&gt;Reader&lt;/code&gt; object.</summary>
+        <summary>Sets the designated parameter to a <c>Reader</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -3868,8 +3883,8 @@
       </Parameters>
       <Docs>
         <param name="parameterName">the name of the parameter</param>
-        <param name="x">a &lt;code&gt;Clob&lt;/code&gt; object that maps an SQL &lt;code&gt;CLOB&lt;/code&gt; value</param>
-        <summary>Sets the designated parameter to the given &lt;code&gt;java.</summary>
+        <param name="x">a <c>Clob</c> object that maps an SQL <c>CLOB</c> value</param>
+        <summary>Sets the designated parameter to the given <c>java.sql.Clob</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -3915,7 +3930,7 @@
         <param name="parameterName">the name of the parameter to be set</param>
         <param name="reader">An object that contains the data to set the parameter value to.</param>
         <param name="length">the number of characters in the parameter data.</param>
-        <summary>Sets the designated parameter to a &lt;code&gt;Reader&lt;/code&gt; object.</summary>
+        <summary>Sets the designated parameter to a <c>Reader</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -3959,7 +3974,9 @@
       <Docs>
         <param name="parameterName">the name of the parameter</param>
         <param name="x">the parameter value</param>
-        <summary>Sets the designated parameter to the given &lt;code&gt;java.</summary>
+        <summary>Sets the designated parameter to the given <c>java.sql.Date</c> value
+            using the default time zone of the virtual machine that is running
+            the application.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -4004,9 +4021,10 @@
       <Docs>
         <param name="parameterName">the name of the parameter</param>
         <param name="x">the parameter value</param>
-        <param name="cal">the &lt;code&gt;Calendar&lt;/code&gt; object the driver will use
+        <param name="cal">the <c>Calendar</c> object the driver will use
                        to construct the date</param>
-        <summary>Sets the designated parameter to the given &lt;code&gt;java.</summary>
+        <summary>Sets the designated parameter to the given <c>java.sql.Date</c> value,
+            using the given <c>Calendar</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -4051,7 +4069,7 @@
       <Docs>
         <param name="parameterName">the name of the parameter</param>
         <param name="x">the parameter value</param>
-        <summary>Sets the designated parameter to the given Java &lt;code&gt;double&lt;/code&gt; value.</summary>
+        <summary>Sets the designated parameter to the given Java <c>double</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -4095,7 +4113,7 @@
       <Docs>
         <param name="parameterName">the name of the parameter</param>
         <param name="x">the parameter value</param>
-        <summary>Sets the designated parameter to the given Java &lt;code&gt;float&lt;/code&gt; value.</summary>
+        <summary>Sets the designated parameter to the given Java <c>float</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -4139,7 +4157,7 @@
       <Docs>
         <param name="parameterName">the name of the parameter</param>
         <param name="x">the parameter value</param>
-        <summary>Sets the designated parameter to the given Java &lt;code&gt;int&lt;/code&gt; value.</summary>
+        <summary>Sets the designated parameter to the given Java <c>int</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -4183,7 +4201,7 @@
       <Docs>
         <param name="parameterName">the name of the parameter</param>
         <param name="x">the parameter value</param>
-        <summary>Sets the designated parameter to the given Java &lt;code&gt;long&lt;/code&gt; value.</summary>
+        <summary>Sets the designated parameter to the given Java <c>long</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -4227,7 +4245,7 @@
       <Docs>
         <param name="parameterName">the name of the parameter</param>
         <param name="value">the parameter value</param>
-        <summary>Sets the designated parameter to a &lt;code&gt;Reader&lt;/code&gt; object.</summary>
+        <summary>Sets the designated parameter to a <c>Reader</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -4273,7 +4291,7 @@
         <param name="parameterName">the name of the parameter to be set</param>
         <param name="value">the parameter value</param>
         <param name="length">the number of characters in the parameter data.</param>
-        <summary>Sets the designated parameter to a &lt;code&gt;Reader&lt;/code&gt; object.</summary>
+        <summary>Sets the designated parameter to a <c>Reader</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -4317,7 +4335,7 @@
       <Docs>
         <param name="parameterName">the name of the parameter</param>
         <param name="reader">An object that contains the data to set the parameter value to.</param>
-        <summary>Sets the designated parameter to a &lt;code&gt;Reader&lt;/code&gt; object.</summary>
+        <summary>Sets the designated parameter to a <c>Reader</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -4361,7 +4379,7 @@
       <Docs>
         <param name="parameterName">the name of the parameter to be set</param>
         <param name="value">the parameter value</param>
-        <summary>Sets the designated parameter to a &lt;code&gt;java.</summary>
+        <summary>Sets the designated parameter to a <c>java.sql.NClob</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -4407,7 +4425,7 @@
         <param name="parameterName">the name of the parameter to be set</param>
         <param name="reader">An object that contains the data to set the parameter value to.</param>
         <param name="length">the number of characters in the parameter data.</param>
-        <summary>Sets the designated parameter to a &lt;code&gt;Reader&lt;/code&gt; object.</summary>
+        <summary>Sets the designated parameter to a <c>Reader</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -4451,7 +4469,7 @@
       <Docs>
         <param name="parameterName">the name of the parameter to be set</param>
         <param name="value">the parameter value</param>
-        <summary>Sets the designated parameter to the given &lt;code&gt;String&lt;/code&gt; object.</summary>
+        <summary>Sets the designated parameter to the given <c>String</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -4494,8 +4512,8 @@
       </Parameters>
       <Docs>
         <param name="parameterName">the name of the parameter</param>
-        <param name="sqlType">the SQL type code defined in &lt;code&gt;java.sql.Types&lt;/code&gt;</param>
-        <summary>Sets the designated parameter to SQL &lt;code&gt;NULL&lt;/code&gt;.</summary>
+        <param name="sqlType">the SQL type code defined in <c>java.sql.Types</c></param>
+        <summary>Sets the designated parameter to SQL <c>NULL</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -4539,11 +4557,11 @@
       </Parameters>
       <Docs>
         <param name="parameterName">the name of the parameter</param>
-        <param name="sqlType">a value from &lt;code&gt;java.sql.Types&lt;/code&gt;</param>
+        <param name="sqlType">a value from <c>java.sql.Types</c></param>
         <param name="typeName">the fully-qualified name of an SQL user-defined type;
                    ignored if the parameter is not a user-defined type or
-                   SQL &lt;code&gt;REF&lt;/code&gt; value</param>
-        <summary>Sets the designated parameter to SQL &lt;code&gt;NULL&lt;/code&gt;.</summary>
+                   SQL <c>REF</c> value</param>
+        <summary>Sets the designated parameter to SQL <c>NULL</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -4729,7 +4747,7 @@
       <Docs>
         <param name="parameterName">the name of the parameter</param>
         <param name="x">the parameter value</param>
-        <summary>Sets the designated parameter to the given &lt;code&gt;java.</summary>
+        <summary>Sets the designated parameter to the given <c>java.sql.RowId</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -4773,7 +4791,7 @@
       <Docs>
         <param name="parameterName">the name of the parameter</param>
         <param name="x">the parameter value</param>
-        <summary>Sets the designated parameter to the given Java &lt;code&gt;short&lt;/code&gt; value.</summary>
+        <summary>Sets the designated parameter to the given Java <c>short</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -4816,8 +4834,8 @@
       </Parameters>
       <Docs>
         <param name="parameterName">the name of the parameter</param>
-        <param name="xmlObject">a &lt;code&gt;SQLXML&lt;/code&gt; object that maps an &lt;code&gt;SQL XML&lt;/code&gt; value</param>
-        <summary>Sets the designated parameter to the given &lt;code&gt;java.</summary>
+        <param name="xmlObject">a <c>SQLXML</c> object that maps an <c>SQL XML</c> value</param>
+        <summary>Sets the designated parameter to the given <c>java.sql.SQLXML</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -4861,7 +4879,7 @@
       <Docs>
         <param name="parameterName">the name of the parameter</param>
         <param name="x">the parameter value</param>
-        <summary>Sets the designated parameter to the given Java &lt;code&gt;String&lt;/code&gt; value.</summary>
+        <summary>Sets the designated parameter to the given Java <c>String</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -4905,7 +4923,7 @@
       <Docs>
         <param name="parameterName">the name of the parameter</param>
         <param name="x">the parameter value</param>
-        <summary>Sets the designated parameter to the given &lt;code&gt;java.</summary>
+        <summary>Sets the designated parameter to the given <c>java.sql.Time</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -4950,9 +4968,10 @@
       <Docs>
         <param name="parameterName">the name of the parameter</param>
         <param name="x">the parameter value</param>
-        <param name="cal">the &lt;code&gt;Calendar&lt;/code&gt; object the driver will use
+        <param name="cal">the <c>Calendar</c> object the driver will use
                        to construct the time</param>
-        <summary>Sets the designated parameter to the given &lt;code&gt;java.</summary>
+        <summary>Sets the designated parameter to the given <c>java.sql.Time</c> value,
+            using the given <c>Calendar</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -4996,7 +5015,7 @@
       <Docs>
         <param name="parameterName">the name of the parameter</param>
         <param name="x">the parameter value</param>
-        <summary>Sets the designated parameter to the given &lt;code&gt;java.</summary>
+        <summary>Sets the designated parameter to the given <c>java.sql.Timestamp</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -5041,9 +5060,10 @@
       <Docs>
         <param name="parameterName">the name of the parameter</param>
         <param name="x">the parameter value</param>
-        <param name="cal">the &lt;code&gt;Calendar&lt;/code&gt; object the driver will use
+        <param name="cal">the <c>Calendar</c> object the driver will use
                        to construct the timestamp</param>
-        <summary>Sets the designated parameter to the given &lt;code&gt;java.</summary>
+        <summary>Sets the designated parameter to the given <c>java.sql.Timestamp</c> value,
+            using the given <c>Calendar</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -5088,7 +5108,7 @@
       <Docs>
         <param name="parameterName">the name of the parameter</param>
         <param name="val">the parameter value</param>
-        <summary>Sets the designated parameter to the given &lt;code&gt;java.</summary>
+        <summary>Sets the designated parameter to the given <c>java.net.URL</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -5128,9 +5148,10 @@
       <Parameters />
       <Docs>
         <summary>Retrieves whether the last OUT parameter read had the value of
-            SQL &lt;code&gt;NULL&lt;/code&gt;.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if the last parameter read was SQL
-            &lt;code&gt;NULL&lt;/code&gt;; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+            SQL <c>NULL</c>.</summary>
+        <returns>
+          <c>true</c> if the last parameter read was SQL
+            <c>NULL</c>; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.Sql/IClob.xml b/docs/Mono.Android/en/Java.Sql/IClob.xml
index 0e2423412b..0b1c53b073 100644
--- a/docs/Mono.Android/en/Java.Sql/IClob.xml
+++ b/docs/Mono.Android/en/Java.Sql/IClob.xml
@@ -26,7 +26,7 @@
   </Attributes>
   <Docs since="1">
     <summary>The mapping in the Java&lt;sup&gt;&lt;font size=-2&gt;TM&lt;/font&gt;&lt;/sup&gt; programming language
-            for the SQL &lt;code&gt;CLOB&lt;/code&gt; type.</summary>
+            for the SQL <c>CLOB</c> type.</summary>
     <remarks>
       <para>
         <format type="text/html">
@@ -123,7 +123,7 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>This method frees the &lt;code&gt;Clob&lt;/code&gt; object and releases the resources the resources
+        <summary>This method frees the <c>Clob</c> object and releases the resources the resources
             that it holds.</summary>
         <remarks>
           <para>
@@ -168,9 +168,10 @@
         <param name="pos">the offset to the first character of the partial value to
             be retrieved.  The first character in the Clob is at position 1.</param>
         <param name="length">the length in characters of the partial value to be retrieved.</param>
-        <summary>Returns a &lt;code&gt;Reader&lt;/code&gt; object that contains a partial &lt;code&gt;Clob&lt;/code&gt; value, starting
+        <summary>Returns a <c>Reader</c> object that contains a partial <c>Clob</c> value, starting
             with the character specified by pos, which is length characters in length.</summary>
-        <returns>&lt;code&gt;Reader&lt;/code&gt; through which the partial &lt;code&gt;Clob&lt;/code&gt; value can be read.</returns>
+        <returns>
+          <c>Reader</c> through which the partial <c>Clob</c> value can be read.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -216,10 +217,10 @@
         <param name="length">the number of consecutive characters to be copied;
             the value for length must be 0 or greater</param>
         <summary>Retrieves a copy of the specified substring
-            in the &lt;code&gt;CLOB&lt;/code&gt; value
-            designated by this &lt;code&gt;Clob&lt;/code&gt; object.</summary>
-        <returns>a &lt;code&gt;String&lt;/code&gt; that is the specified substring in
-                    the &lt;code&gt;CLOB&lt;/code&gt; value designated by this &lt;code&gt;Clob&lt;/code&gt; object</returns>
+            in the <c>CLOB</c> value
+            designated by this <c>Clob</c> object.</summary>
+        <returns>a <c>String</c> that is the specified substring in
+                    the <c>CLOB</c> value designated by this <c>Clob</c> object</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -259,9 +260,9 @@
       <Parameters />
       <Docs>
         <summary>Retrieves the number of characters
-            in the &lt;code&gt;CLOB&lt;/code&gt; value
-            designated by this &lt;code&gt;Clob&lt;/code&gt; object.</summary>
-        <returns>length of the &lt;code&gt;CLOB&lt;/code&gt; in characters</returns>
+            in the <c>CLOB</c> value
+            designated by this <c>Clob</c> object.</summary>
+        <returns>length of the <c>CLOB</c> in characters</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -303,13 +304,13 @@
         <Parameter Name="start" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="searchstr">the &lt;code&gt;Clob&lt;/code&gt; object for which to search</param>
+        <param name="searchstr">the <c>Clob</c> object for which to search</param>
         <param name="start">the position at which to begin searching; the first
                          position is 1</param>
         <summary>Retrieves the character position at which the specified
-            &lt;code&gt;Clob&lt;/code&gt; object &lt;code&gt;searchstr&lt;/code&gt; appears in this
-            &lt;code&gt;Clob&lt;/code&gt; object.</summary>
-        <returns>the position at which the &lt;code&gt;Clob&lt;/code&gt; object appears
+            <c>Clob</c> object <c>searchstr</c> appears in this
+            <c>Clob</c> object.</summary>
+        <returns>the position at which the <c>Clob</c> object appears
                          or -1 if it is not present; the first position is 1</returns>
         <remarks>
           <para>
@@ -356,8 +357,8 @@
         <param name="start">the position at which to begin searching; the first position
                          is 1</param>
         <summary>Retrieves the character position at which the specified substring
-            &lt;code&gt;searchstr&lt;/code&gt; appears in the SQL &lt;code&gt;CLOB&lt;/code&gt; value
-            represented by this &lt;code&gt;Clob&lt;/code&gt; object.</summary>
+            <c>searchstr</c> appears in the SQL <c>CLOB</c> value
+            represented by this <c>Clob</c> object.</summary>
         <returns>the position at which the substring appears or -1 if it is not
                     present; the first position is 1</returns>
         <remarks>
@@ -401,10 +402,10 @@
       </Parameters>
       <Docs>
         <param name="pos">the position at which to start writing to this
-                   &lt;code&gt;CLOB&lt;/code&gt; object; The first position is 1</param>
+                   <c>CLOB</c> object; The first position is 1</param>
         <summary>Retrieves a stream to be used to write Ascii characters to the
-            &lt;code&gt;CLOB&lt;/code&gt; value that this &lt;code&gt;Clob&lt;/code&gt; object represents,
-            starting at position &lt;code&gt;pos&lt;/code&gt;.</summary>
+            <c>CLOB</c> value that this <c>Clob</c> object represents,
+            starting at position <c>pos</c>.</summary>
         <returns>the stream to which ASCII encoded characters can be written</returns>
         <remarks>
           <para>
@@ -447,10 +448,10 @@
       </Parameters>
       <Docs>
         <param name="pos">the position at which to start writing to the
-                   &lt;code&gt;CLOB&lt;/code&gt; value; The first position is 1</param>
+                   <c>CLOB</c> value; The first position is 1</param>
         <summary>Retrieves a stream to be used to write a stream of Unicode characters
-            to the &lt;code&gt;CLOB&lt;/code&gt; value that this &lt;code&gt;Clob&lt;/code&gt; object
-            represents, at position &lt;code&gt;pos&lt;/code&gt;.</summary>
+            to the <c>CLOB</c> value that this <c>Clob</c> object
+            represents, at position <c>pos</c>.</summary>
         <returns>a stream to which Unicode encoded characters can be written</returns>
         <remarks>
           <para>
@@ -493,14 +494,14 @@
         <Parameter Name="str" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="pos">the position at which to start writing to the &lt;code&gt;CLOB&lt;/code&gt;
-                    value that this &lt;code&gt;Clob&lt;/code&gt; object represents;
+        <param name="pos">the position at which to start writing to the <c>CLOB</c>
+                    value that this <c>Clob</c> object represents;
             The first position is 1</param>
-        <param name="str">the string to be written to the &lt;code&gt;CLOB&lt;/code&gt;
-                   value that this &lt;code&gt;Clob&lt;/code&gt; designates</param>
-        <summary>Writes the given Java &lt;code&gt;String&lt;/code&gt; to the &lt;code&gt;CLOB&lt;/code&gt;
-            value that this &lt;code&gt;Clob&lt;/code&gt; object designates at the position
-            &lt;code&gt;pos&lt;/code&gt;.</summary>
+        <param name="str">the string to be written to the <c>CLOB</c>
+                   value that this <c>Clob</c> designates</param>
+        <summary>Writes the given Java <c>String</c> to the <c>CLOB</c>
+            value that this <c>Clob</c> object designates at the position
+            <c>pos</c>.</summary>
         <returns>the number of characters written</returns>
         <remarks>
           <para>
@@ -546,15 +547,15 @@
       </Parameters>
       <Docs>
         <param name="pos">the position at which to start writing to this
-                   &lt;code&gt;CLOB&lt;/code&gt; object; The first position  is 1</param>
-        <param name="str">the string to be written to the &lt;code&gt;CLOB&lt;/code&gt;
-                   value that this &lt;code&gt;Clob&lt;/code&gt; object represents</param>
-        <param name="offset">the offset into &lt;code&gt;str&lt;/code&gt; to start reading
+                   <c>CLOB</c> object; The first position  is 1</param>
+        <param name="str">the string to be written to the <c>CLOB</c>
+                   value that this <c>Clob</c> object represents</param>
+        <param name="offset">the offset into <c>str</c> to start reading
                    the characters to be written</param>
         <param name="len">the number of characters to be written</param>
-        <summary>Writes &lt;code&gt;len&lt;/code&gt; characters of &lt;code&gt;str&lt;/code&gt;, starting
-            at character &lt;code&gt;offset&lt;/code&gt;, to the &lt;code&gt;CLOB&lt;/code&gt; value
-            that this &lt;code&gt;Clob&lt;/code&gt; represents.</summary>
+        <summary>Writes <c>len</c> characters of <c>str</c>, starting
+            at character <c>offset</c>, to the <c>CLOB</c> value
+            that this <c>Clob</c> represents.</summary>
         <returns>the number of characters written</returns>
         <remarks>
           <para>
@@ -596,10 +597,10 @@
         <Parameter Name="len" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="len">the length, in characters, to which the &lt;code&gt;CLOB&lt;/code&gt; value
+        <param name="len">the length, in characters, to which the <c>CLOB</c> value
                    should be truncated</param>
-        <summary>Truncates the &lt;code&gt;CLOB&lt;/code&gt; value that this &lt;code&gt;Clob&lt;/code&gt;
-            designates to have a length of &lt;code&gt;len&lt;/code&gt;
+        <summary>Truncates the <c>CLOB</c> value that this <c>Clob</c>
+            designates to have a length of <c>len</c>
             characters.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.Sql/IConnection.xml b/docs/Mono.Android/en/Java.Sql/IConnection.xml
index 381c68c211..544dc2e521 100644
--- a/docs/Mono.Android/en/Java.Sql/IConnection.xml
+++ b/docs/Mono.Android/en/Java.Sql/IConnection.xml
@@ -139,7 +139,7 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Clears all warnings reported for this &lt;code&gt;Connection&lt;/code&gt; object.</summary>
+        <summary>Clears all warnings reported for this <c>Connection</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -217,7 +217,7 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Releases this &lt;code&gt;Connection&lt;/code&gt; object's database and JDBC resources
+        <summary>Releases this <c>Connection</c> object's database and JDBC resources
             immediately instead of waiting for them to be automatically released.</summary>
         <remarks>
           <para>
@@ -259,7 +259,7 @@
       <Docs>
         <summary>Makes all changes made since the previous
             commit/rollback permanent and releases any database locks
-            currently held by this &lt;code&gt;Connection&lt;/code&gt; object.</summary>
+            currently held by this <c>Connection</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -304,7 +304,7 @@
       <Docs>
         <param name="typeName">the SQL name of the type the elements of the array map to. The typeName is a
             database-specific name which may be the name of a built-in type, a user-defined type or a standard  SQL type supported by this database. This
-             is the value returned by &lt;code&gt;Array.getBaseTypeName&lt;/code&gt;</param>
+             is the value returned by <c>Array.getBaseTypeName</c></param>
         <param name="elements">the elements that populate the returned object</param>
         <summary>Factory method for creating Array objects.</summary>
         <returns>an Array object whose elements map to the specified SQL type</returns>
@@ -348,8 +348,8 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Constructs an object that implements the &lt;code&gt;Blob&lt;/code&gt; interface.</summary>
-        <returns>An object that implements the &lt;code&gt;Blob&lt;/code&gt; interface</returns>
+        <summary>Constructs an object that implements the <c>Blob</c> interface.</summary>
+        <returns>An object that implements the <c>Blob</c> interface</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -388,8 +388,8 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Constructs an object that implements the &lt;code&gt;Clob&lt;/code&gt; interface.</summary>
-        <returns>An object that implements the &lt;code&gt;Clob&lt;/code&gt; interface</returns>
+        <summary>Constructs an object that implements the <c>Clob</c> interface.</summary>
+        <returns>An object that implements the <c>Clob</c> interface</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -428,8 +428,8 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Constructs an object that implements the &lt;code&gt;NClob&lt;/code&gt; interface.</summary>
-        <returns>An object that implements the &lt;code&gt;NClob&lt;/code&gt; interface</returns>
+        <summary>Constructs an object that implements the <c>NClob</c> interface.</summary>
+        <returns>An object that implements the <c>NClob</c> interface</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -468,8 +468,8 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Constructs an object that implements the &lt;code&gt;SQLXML&lt;/code&gt; interface.</summary>
-        <returns>An object that implements the &lt;code&gt;SQLXML&lt;/code&gt; interface</returns>
+        <summary>Constructs an object that implements the <c>SQLXML</c> interface.</summary>
+        <returns>An object that implements the <c>SQLXML</c> interface</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -508,9 +508,9 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Creates a &lt;code&gt;Statement&lt;/code&gt; object for sending
+        <summary>Creates a <c>Statement</c> object for sending
             SQL statements to the database.</summary>
-        <returns>a new default &lt;code&gt;Statement&lt;/code&gt; object</returns>
+        <returns>a new default <c>Statement</c> object</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -553,16 +553,16 @@
       </Parameters>
       <Docs>
         <param name="resultSetType">a result set type; one of
-                   &lt;code&gt;ResultSet.TYPE_FORWARD_ONLY&lt;/code&gt;,
-                   &lt;code&gt;ResultSet.TYPE_SCROLL_INSENSITIVE&lt;/code&gt;, or
-                   &lt;code&gt;ResultSet.TYPE_SCROLL_SENSITIVE&lt;/code&gt;</param>
+                   <c>ResultSet.TYPE_FORWARD_ONLY</c>,
+                   <c>ResultSet.TYPE_SCROLL_INSENSITIVE</c>, or
+                   <c>ResultSet.TYPE_SCROLL_SENSITIVE</c></param>
         <param name="resultSetConcurrency">a concurrency type; one of
-                   &lt;code&gt;ResultSet.CONCUR_READ_ONLY&lt;/code&gt; or
-                   &lt;code&gt;ResultSet.CONCUR_UPDATABLE&lt;/code&gt;</param>
-        <summary>Creates a &lt;code&gt;Statement&lt;/code&gt; object that will generate
-            &lt;code&gt;ResultSet&lt;/code&gt; objects with the given type and concurrency.</summary>
-        <returns>a new &lt;code&gt;Statement&lt;/code&gt; object that will generate
-                    &lt;code&gt;ResultSet&lt;/code&gt; objects with the given type and
+                   <c>ResultSet.CONCUR_READ_ONLY</c> or
+                   <c>ResultSet.CONCUR_UPDATABLE</c></param>
+        <summary>Creates a <c>Statement</c> object that will generate
+            <c>ResultSet</c> objects with the given type and concurrency.</summary>
+        <returns>a new <c>Statement</c> object that will generate
+                    <c>ResultSet</c> objects with the given type and
                     concurrency</returns>
         <remarks>
           <para>
@@ -606,24 +606,24 @@
         <Parameter Name="resultSetHoldability" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="resultSetType">one of the following &lt;code&gt;ResultSet&lt;/code&gt;
+        <param name="resultSetType">one of the following <c>ResultSet</c>
                    constants:
-                    &lt;code&gt;ResultSet.TYPE_FORWARD_ONLY&lt;/code&gt;,
-                    &lt;code&gt;ResultSet.TYPE_SCROLL_INSENSITIVE&lt;/code&gt;, or
-                    &lt;code&gt;ResultSet.TYPE_SCROLL_SENSITIVE&lt;/code&gt;</param>
-        <param name="resultSetConcurrency">one of the following &lt;code&gt;ResultSet&lt;/code&gt;
+                    <c>ResultSet.TYPE_FORWARD_ONLY</c>,
+                    <c>ResultSet.TYPE_SCROLL_INSENSITIVE</c>, or
+                    <c>ResultSet.TYPE_SCROLL_SENSITIVE</c></param>
+        <param name="resultSetConcurrency">one of the following <c>ResultSet</c>
                    constants:
-                    &lt;code&gt;ResultSet.CONCUR_READ_ONLY&lt;/code&gt; or
-                    &lt;code&gt;ResultSet.CONCUR_UPDATABLE&lt;/code&gt;</param>
-        <param name="resultSetHoldability">one of the following &lt;code&gt;ResultSet&lt;/code&gt;
+                    <c>ResultSet.CONCUR_READ_ONLY</c> or
+                    <c>ResultSet.CONCUR_UPDATABLE</c></param>
+        <param name="resultSetHoldability">one of the following <c>ResultSet</c>
                    constants:
-                    &lt;code&gt;ResultSet.HOLD_CURSORS_OVER_COMMIT&lt;/code&gt; or
-                    &lt;code&gt;ResultSet.CLOSE_CURSORS_AT_COMMIT&lt;/code&gt;</param>
-        <summary>Creates a &lt;code&gt;Statement&lt;/code&gt; object that will generate
-            &lt;code&gt;ResultSet&lt;/code&gt; objects with the given type, concurrency,
+                    <c>ResultSet.HOLD_CURSORS_OVER_COMMIT</c> or
+                    <c>ResultSet.CLOSE_CURSORS_AT_COMMIT</c></param>
+        <summary>Creates a <c>Statement</c> object that will generate
+            <c>ResultSet</c> objects with the given type, concurrency,
             and holdability.</summary>
-        <returns>a new &lt;code&gt;Statement&lt;/code&gt; object that will generate
-                    &lt;code&gt;ResultSet&lt;/code&gt; objects with the given type,
+        <returns>a new <c>Statement</c> object that will generate
+                    <c>ResultSet</c> objects with the given type,
                     concurrency, and holdability</returns>
         <remarks>
           <para>
@@ -666,10 +666,10 @@
         <Parameter Name="attributes" Type="Java.Lang.Object[]" />
       </Parameters>
       <Docs>
-        <param name="typeName">the SQL type name of the SQL structured type that this &lt;code&gt;Struct&lt;/code&gt;
+        <param name="typeName">the SQL type name of the SQL structured type that this <c>Struct</c>
             object maps to. The typeName is the name of  a user-defined type that
             has been defined for this database. It is the value returned by
-            &lt;code&gt;Struct.getSQLTypeName&lt;/code&gt;.</param>
+            <c>Struct.getSQLTypeName</c>.</param>
         <param name="attributes">the attributes that populate the returned object</param>
         <summary>Factory method for creating Struct objects.</summary>
         <returns>a Struct object that maps to the given SQL type and is populated with the given attributes</returns>
@@ -955,9 +955,9 @@
         <param name="sql">an SQL statement that may contain one or more '?'
             parameter placeholders. Typically this statement is specified using JDBC
             call escape syntax.</param>
-        <summary>Creates a &lt;code&gt;CallableStatement&lt;/code&gt; object for calling
+        <summary>Creates a <c>CallableStatement</c> object for calling
             database stored procedures.</summary>
-        <returns>a new default &lt;code&gt;CallableStatement&lt;/code&gt; object containing the
+        <returns>a new default <c>CallableStatement</c> object containing the
             pre-compiled SQL statement</returns>
         <remarks>
           <para>
@@ -1001,19 +1001,19 @@
         <Parameter Name="resultSetConcurrency" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="sql">a &lt;code&gt;String&lt;/code&gt; object that is the SQL statement to
+        <param name="sql">a <c>String</c> object that is the SQL statement to
                        be sent to the database; may contain on or more '?' parameters</param>
         <param name="resultSetType">a result set type; one of
-                    &lt;code&gt;ResultSet.TYPE_FORWARD_ONLY&lt;/code&gt;,
-                    &lt;code&gt;ResultSet.TYPE_SCROLL_INSENSITIVE&lt;/code&gt;, or
-                    &lt;code&gt;ResultSet.TYPE_SCROLL_SENSITIVE&lt;/code&gt;</param>
+                    <c>ResultSet.TYPE_FORWARD_ONLY</c>,
+                    <c>ResultSet.TYPE_SCROLL_INSENSITIVE</c>, or
+                    <c>ResultSet.TYPE_SCROLL_SENSITIVE</c></param>
         <param name="resultSetConcurrency">a concurrency type; one of
-                    &lt;code&gt;ResultSet.CONCUR_READ_ONLY&lt;/code&gt; or
-                    &lt;code&gt;ResultSet.CONCUR_UPDATABLE&lt;/code&gt;</param>
-        <summary>Creates a &lt;code&gt;CallableStatement&lt;/code&gt; object that will generate
-            &lt;code&gt;ResultSet&lt;/code&gt; objects with the given type and concurrency.</summary>
-        <returns>a new &lt;code&gt;CallableStatement&lt;/code&gt; object containing the
-            pre-compiled SQL statement that will produce &lt;code&gt;ResultSet&lt;/code&gt;
+                    <c>ResultSet.CONCUR_READ_ONLY</c> or
+                    <c>ResultSet.CONCUR_UPDATABLE</c></param>
+        <summary>Creates a <c>CallableStatement</c> object that will generate
+            <c>ResultSet</c> objects with the given type and concurrency.</summary>
+        <returns>a new <c>CallableStatement</c> object containing the
+            pre-compiled SQL statement that will produce <c>ResultSet</c>
             objects with the given type and concurrency</returns>
         <remarks>
           <para>
@@ -1058,26 +1058,26 @@
         <Parameter Name="resultSetHoldability" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="sql">a &lt;code&gt;String&lt;/code&gt; object that is the SQL statement to
+        <param name="sql">a <c>String</c> object that is the SQL statement to
                        be sent to the database; may contain on or more '?' parameters</param>
-        <param name="resultSetType">one of the following &lt;code&gt;ResultSet&lt;/code&gt;
+        <param name="resultSetType">one of the following <c>ResultSet</c>
                    constants:
-                    &lt;code&gt;ResultSet.TYPE_FORWARD_ONLY&lt;/code&gt;,
-                    &lt;code&gt;ResultSet.TYPE_SCROLL_INSENSITIVE&lt;/code&gt;, or
-                    &lt;code&gt;ResultSet.TYPE_SCROLL_SENSITIVE&lt;/code&gt;</param>
-        <param name="resultSetConcurrency">one of the following &lt;code&gt;ResultSet&lt;/code&gt;
+                    <c>ResultSet.TYPE_FORWARD_ONLY</c>,
+                    <c>ResultSet.TYPE_SCROLL_INSENSITIVE</c>, or
+                    <c>ResultSet.TYPE_SCROLL_SENSITIVE</c></param>
+        <param name="resultSetConcurrency">one of the following <c>ResultSet</c>
                    constants:
-                    &lt;code&gt;ResultSet.CONCUR_READ_ONLY&lt;/code&gt; or
-                    &lt;code&gt;ResultSet.CONCUR_UPDATABLE&lt;/code&gt;</param>
-        <param name="resultSetHoldability">one of the following &lt;code&gt;ResultSet&lt;/code&gt;
+                    <c>ResultSet.CONCUR_READ_ONLY</c> or
+                    <c>ResultSet.CONCUR_UPDATABLE</c></param>
+        <param name="resultSetHoldability">one of the following <c>ResultSet</c>
                    constants:
-                    &lt;code&gt;ResultSet.HOLD_CURSORS_OVER_COMMIT&lt;/code&gt; or
-                    &lt;code&gt;ResultSet.CLOSE_CURSORS_AT_COMMIT&lt;/code&gt;</param>
-        <summary>Creates a &lt;code&gt;CallableStatement&lt;/code&gt; object that will generate
-            &lt;code&gt;ResultSet&lt;/code&gt; objects with the given type and concurrency.</summary>
-        <returns>a new &lt;code&gt;CallableStatement&lt;/code&gt; object, containing the
+                    <c>ResultSet.HOLD_CURSORS_OVER_COMMIT</c> or
+                    <c>ResultSet.CLOSE_CURSORS_AT_COMMIT</c></param>
+        <summary>Creates a <c>CallableStatement</c> object that will generate
+            <c>ResultSet</c> objects with the given type and concurrency.</summary>
+        <returns>a new <c>CallableStatement</c> object, containing the
                     pre-compiled SQL statement, that will generate
-                    &lt;code&gt;ResultSet&lt;/code&gt; objects with the given type,
+                    <c>ResultSet</c> objects with the given type,
                     concurrency, and holdability</returns>
         <remarks>
           <para>
@@ -1121,9 +1121,9 @@
       <Docs>
         <param name="sql">an SQL statement that may contain one or more '?' IN
             parameter placeholders</param>
-        <summary>Creates a &lt;code&gt;PreparedStatement&lt;/code&gt; object for sending
+        <summary>Creates a <c>PreparedStatement</c> object for sending
             parameterized SQL statements to the database.</summary>
-        <returns>a new default &lt;code&gt;PreparedStatement&lt;/code&gt; object containing the
+        <returns>a new default <c>PreparedStatement</c> object containing the
             pre-compiled SQL statement</returns>
         <remarks>
           <para>
@@ -1170,11 +1170,11 @@
                    parameter placeholders</param>
         <param name="autoGeneratedKeys">a flag indicating whether auto-generated keys
                    should be returned; one of
-                   &lt;code&gt;Statement.RETURN_GENERATED_KEYS&lt;/code&gt; or
-                   &lt;code&gt;Statement.NO_GENERATED_KEYS&lt;/code&gt;</param>
-        <summary>Creates a default &lt;code&gt;PreparedStatement&lt;/code&gt; object that has
+                   <c>Statement.RETURN_GENERATED_KEYS</c> or
+                   <c>Statement.NO_GENERATED_KEYS</c></param>
+        <summary>Creates a default <c>PreparedStatement</c> object that has
             the capability to retrieve auto-generated keys.</summary>
-        <returns>a new &lt;code&gt;PreparedStatement&lt;/code&gt; object, containing the
+        <returns>a new <c>PreparedStatement</c> object, containing the
                     pre-compiled SQL statement, that will have the capability of
                     returning auto-generated keys</returns>
         <remarks>
@@ -1222,9 +1222,9 @@
                    parameter placeholders</param>
         <param name="columnIndexes">an array of column indexes indicating the columns
                    that should be returned from the inserted row or rows</param>
-        <summary>Creates a default &lt;code&gt;PreparedStatement&lt;/code&gt; object capable
+        <summary>Creates a default <c>PreparedStatement</c> object capable
             of returning the auto-generated keys designated by the given array.</summary>
-        <returns>a new &lt;code&gt;PreparedStatement&lt;/code&gt; object, containing the
+        <returns>a new <c>PreparedStatement</c> object, containing the
                     pre-compiled statement, that is capable of returning the
                     auto-generated keys designated by the given array of column
                     indexes</returns>
@@ -1273,9 +1273,9 @@
                    parameter placeholders</param>
         <param name="columnNames">an array of column names indicating the columns
                    that should be returned from the inserted row or rows</param>
-        <summary>Creates a default &lt;code&gt;PreparedStatement&lt;/code&gt; object capable
+        <summary>Creates a default <c>PreparedStatement</c> object capable
             of returning the auto-generated keys designated by the given array.</summary>
-        <returns>a new &lt;code&gt;PreparedStatement&lt;/code&gt; object, containing the
+        <returns>a new <c>PreparedStatement</c> object, containing the
                     pre-compiled statement, that is capable of returning the
                     auto-generated keys designated by the given array of column
                     names</returns>
@@ -1321,20 +1321,20 @@
         <Parameter Name="resultSetConcurrency" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="sql">a &lt;code&gt;String&lt;/code&gt; object that is the SQL statement to
+        <param name="sql">a <c>String</c> object that is the SQL statement to
                        be sent to the database; may contain one or more '?' IN
                        parameters</param>
         <param name="resultSetType">a result set type; one of
-                    &lt;code&gt;ResultSet.TYPE_FORWARD_ONLY&lt;/code&gt;,
-                    &lt;code&gt;ResultSet.TYPE_SCROLL_INSENSITIVE&lt;/code&gt;, or
-                    &lt;code&gt;ResultSet.TYPE_SCROLL_SENSITIVE&lt;/code&gt;</param>
+                    <c>ResultSet.TYPE_FORWARD_ONLY</c>,
+                    <c>ResultSet.TYPE_SCROLL_INSENSITIVE</c>, or
+                    <c>ResultSet.TYPE_SCROLL_SENSITIVE</c></param>
         <param name="resultSetConcurrency">a concurrency type; one of
-                    &lt;code&gt;ResultSet.CONCUR_READ_ONLY&lt;/code&gt; or
-                    &lt;code&gt;ResultSet.CONCUR_UPDATABLE&lt;/code&gt;</param>
-        <summary>Creates a &lt;code&gt;PreparedStatement&lt;/code&gt; object that will generate
-            &lt;code&gt;ResultSet&lt;/code&gt; objects with the given type and concurrency.</summary>
+                    <c>ResultSet.CONCUR_READ_ONLY</c> or
+                    <c>ResultSet.CONCUR_UPDATABLE</c></param>
+        <summary>Creates a <c>PreparedStatement</c> object that will generate
+            <c>ResultSet</c> objects with the given type and concurrency.</summary>
         <returns>a new PreparedStatement object containing the
-            pre-compiled SQL statement that will produce &lt;code&gt;ResultSet&lt;/code&gt;
+            pre-compiled SQL statement that will produce <c>ResultSet</c>
             objects with the given type and concurrency</returns>
         <remarks>
           <para>
@@ -1379,28 +1379,28 @@
         <Parameter Name="resultSetHoldability" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="sql">a &lt;code&gt;String&lt;/code&gt; object that is the SQL statement to
+        <param name="sql">a <c>String</c> object that is the SQL statement to
                        be sent to the database; may contain one or more '?' IN
                        parameters</param>
-        <param name="resultSetType">one of the following &lt;code&gt;ResultSet&lt;/code&gt;
+        <param name="resultSetType">one of the following <c>ResultSet</c>
                    constants:
-                    &lt;code&gt;ResultSet.TYPE_FORWARD_ONLY&lt;/code&gt;,
-                    &lt;code&gt;ResultSet.TYPE_SCROLL_INSENSITIVE&lt;/code&gt;, or
-                    &lt;code&gt;ResultSet.TYPE_SCROLL_SENSITIVE&lt;/code&gt;</param>
-        <param name="resultSetConcurrency">one of the following &lt;code&gt;ResultSet&lt;/code&gt;
+                    <c>ResultSet.TYPE_FORWARD_ONLY</c>,
+                    <c>ResultSet.TYPE_SCROLL_INSENSITIVE</c>, or
+                    <c>ResultSet.TYPE_SCROLL_SENSITIVE</c></param>
+        <param name="resultSetConcurrency">one of the following <c>ResultSet</c>
                    constants:
-                    &lt;code&gt;ResultSet.CONCUR_READ_ONLY&lt;/code&gt; or
-                    &lt;code&gt;ResultSet.CONCUR_UPDATABLE&lt;/code&gt;</param>
-        <param name="resultSetHoldability">one of the following &lt;code&gt;ResultSet&lt;/code&gt;
+                    <c>ResultSet.CONCUR_READ_ONLY</c> or
+                    <c>ResultSet.CONCUR_UPDATABLE</c></param>
+        <param name="resultSetHoldability">one of the following <c>ResultSet</c>
                    constants:
-                    &lt;code&gt;ResultSet.HOLD_CURSORS_OVER_COMMIT&lt;/code&gt; or
-                    &lt;code&gt;ResultSet.CLOSE_CURSORS_AT_COMMIT&lt;/code&gt;</param>
-        <summary>Creates a &lt;code&gt;PreparedStatement&lt;/code&gt; object that will generate
-            &lt;code&gt;ResultSet&lt;/code&gt; objects with the given type, concurrency,
+                    <c>ResultSet.HOLD_CURSORS_OVER_COMMIT</c> or
+                    <c>ResultSet.CLOSE_CURSORS_AT_COMMIT</c></param>
+        <summary>Creates a <c>PreparedStatement</c> object that will generate
+            <c>ResultSet</c> objects with the given type, concurrency,
             and holdability.</summary>
-        <returns>a new &lt;code&gt;PreparedStatement&lt;/code&gt; object, containing the
+        <returns>a new <c>PreparedStatement</c> object, containing the
                     pre-compiled SQL statement, that will generate
-                    &lt;code&gt;ResultSet&lt;/code&gt; objects with the given type,
+                    <c>ResultSet</c> objects with the given type,
                     concurrency, and holdability</returns>
         <remarks>
           <para>
@@ -1479,8 +1479,8 @@
         <Parameter Name="savepoint" Type="Java.Sql.ISavepoint" />
       </Parameters>
       <Docs>
-        <param name="savepoint">the &lt;code&gt;Savepoint&lt;/code&gt; object to be removed</param>
-        <summary>Removes the specified &lt;code&gt;Savepoint&lt;/code&gt;  and subsequent &lt;code&gt;Savepoint&lt;/code&gt; objects from the current
+        <param name="savepoint">the <c>Savepoint</c> object to be removed</param>
+        <summary>Removes the specified <c>Savepoint</c>  and subsequent <c>Savepoint</c> objects from the current
             transaction.</summary>
         <remarks>
           <para>
@@ -1524,7 +1524,7 @@
       <Docs>
         <summary>Undoes all changes made in the current transaction
             and releases any database locks currently held
-            by this &lt;code&gt;Connection&lt;/code&gt; object.</summary>
+            by this <c>Connection</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -1566,8 +1566,8 @@
         <Parameter Name="savepoint" Type="Java.Sql.ISavepoint" />
       </Parameters>
       <Docs>
-        <param name="savepoint">the &lt;code&gt;Savepoint&lt;/code&gt; object to roll back to</param>
-        <summary>Undoes all changes made after the given &lt;code&gt;Savepoint&lt;/code&gt; object
+        <param name="savepoint">the <c>Savepoint</c> object to roll back to</param>
+        <summary>Undoes all changes made after the given <c>Savepoint</c> object
             was set.</summary>
         <remarks>
           <para>
@@ -1657,8 +1657,8 @@
       <Parameters />
       <Docs>
         <summary>Creates an unnamed savepoint in the current transaction and
-            returns the new &lt;code&gt;Savepoint&lt;/code&gt; object that represents it.</summary>
-        <returns>the new &lt;code&gt;Savepoint&lt;/code&gt; object</returns>
+            returns the new <c>Savepoint</c> object that represents it.</summary>
+        <returns>the new <c>Savepoint</c> object</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1699,10 +1699,10 @@
         <Parameter Name="name" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="name">a &lt;code&gt;String&lt;/code&gt; containing the name of the savepoint</param>
+        <param name="name">a <c>String</c> containing the name of the savepoint</param>
         <summary>Creates a savepoint with the given name in the current transaction
-            and returns the new &lt;code&gt;Savepoint&lt;/code&gt; object that represents it.</summary>
-        <returns>the new &lt;code&gt;Savepoint&lt;/code&gt; object</returns>
+            and returns the new <c>Savepoint</c> object that represents it.</summary>
+        <returns>the new <c>Savepoint</c> object</returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.Sql/IDatabaseMetaData.xml b/docs/Mono.Android/en/Java.Sql/IDatabaseMetaData.xml
index 2d38a3b640..844633391e 100644
--- a/docs/Mono.Android/en/Java.Sql/IDatabaseMetaData.xml
+++ b/docs/Mono.Android/en/Java.Sql/IDatabaseMetaData.xml
@@ -66,8 +66,9 @@
       <Parameters />
       <Docs>
         <summary>Retrieves whether the current user can call all the procedures
-            returned by the method &lt;code&gt;getProcedures&lt;/code&gt;.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+            returned by the method <c>getProcedures</c>.</summary>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -107,9 +108,10 @@
       <Parameters />
       <Docs>
         <summary>Retrieves whether the current user can use all the tables returned
-            by the method &lt;code&gt;getTables&lt;/code&gt; in a &lt;code&gt;SELECT&lt;/code&gt;
+            by the method <c>getTables</c> in a <c>SELECT</c>
             statement.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -148,7 +150,7 @@
       </ReturnValue>
       <MemberValue>0</MemberValue>
       <Docs>
-        <summary>Indicates that &lt;code&gt;NULL&lt;/code&gt; values might not be allowed.</summary>
+        <summary>Indicates that <c>NULL</c> values might not be allowed.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -184,7 +186,7 @@
       </ReturnValue>
       <MemberValue>1</MemberValue>
       <Docs>
-        <summary>Indicates that &lt;code&gt;NULL&lt;/code&gt; values are definitely allowed.</summary>
+        <summary>Indicates that <c>NULL</c> values are definitely allowed.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -220,7 +222,7 @@
       </ReturnValue>
       <MemberValue>2</MemberValue>
       <Docs>
-        <summary>Indicates that whether &lt;code&gt;NULL&lt;/code&gt; values are allowed is not
+        <summary>Indicates that whether <c>NULL</c> values are allowed is not
             known.</summary>
         <remarks>
           <para>
@@ -257,9 +259,10 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Retrieves whether a &lt;code&gt;SQLException&lt;/code&gt; while autoCommit is &lt;code&gt;true&lt;/code&gt; inidcates
+        <summary>Retrieves whether a <c>SQLException</c> while autoCommit is <c>true</c> inidcates
             that all open ResultSets are closed, even ones that are holdable.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -639,7 +642,7 @@
       </ReturnValue>
       <MemberValue>0</MemberValue>
       <Docs>
-        <summary>Indicates that the column might not allow &lt;code&gt;NULL&lt;/code&gt; values.</summary>
+        <summary>Indicates that the column might not allow <c>NULL</c> values.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -675,7 +678,7 @@
       </ReturnValue>
       <MemberValue>1</MemberValue>
       <Docs>
-        <summary>Indicates that the column definitely allows &lt;code&gt;NULL&lt;/code&gt; values.</summary>
+        <summary>Indicates that the column definitely allows <c>NULL</c> values.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -899,7 +902,8 @@
       <Docs>
         <summary>Retrieves whether a data definition statement within a transaction forces
             the transaction to commit.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -940,7 +944,8 @@
       <Docs>
         <summary>Retrieves whether this database ignores a data definition statement
             within a transaction.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1011,14 +1016,15 @@
         <Parameter Name="type" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="type">the &lt;code&gt;ResultSet&lt;/code&gt; type; one of
-                   &lt;code&gt;ResultSet.TYPE_FORWARD_ONLY&lt;/code&gt;,
-                   &lt;code&gt;ResultSet.TYPE_SCROLL_INSENSITIVE&lt;/code&gt;, or
-                   &lt;code&gt;ResultSet.TYPE_SCROLL_SENSITIVE&lt;/code&gt;</param>
+        <param name="type">the <c>ResultSet</c> type; one of
+                   <c>ResultSet.TYPE_FORWARD_ONLY</c>,
+                   <c>ResultSet.TYPE_SCROLL_INSENSITIVE</c>, or
+                   <c>ResultSet.TYPE_SCROLL_SENSITIVE</c></param>
         <summary>Retrieves whether or not a visible row delete can be detected by
-            calling the method &lt;code&gt;ResultSet.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if deletes are detected by the given result set type;
-                    &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+            calling the method <c>ResultSet.rowDeleted</c>.</summary>
+        <returns>
+          <c>true</c> if deletes are detected by the given result set type;
+                    <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1058,9 +1064,10 @@
       <Parameters />
       <Docs>
         <summary>Retrieves whether the return value for the method
-            &lt;code&gt;getMaxRowSize&lt;/code&gt; includes the SQL data types
-            &lt;code&gt;LONGVARCHAR&lt;/code&gt; and &lt;code&gt;LONGVARBINARY&lt;/code&gt;.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+            <c>getMaxRowSize</c> includes the SQL data types
+            <c>LONGVARCHAR</c> and <c>LONGVARBINARY</c>.</summary>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1426,7 +1433,7 @@
       </ReturnValue>
       <MemberValue>0</MemberValue>
       <Docs>
-        <summary>Indicates that &lt;code&gt;NULL&lt;/code&gt; values are not allowed.</summary>
+        <summary>Indicates that <c>NULL</c> values are not allowed.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -1498,7 +1505,7 @@
       </ReturnValue>
       <MemberValue>1</MemberValue>
       <Docs>
-        <summary>Indicates that &lt;code&gt;NULL&lt;/code&gt; values are allowed.</summary>
+        <summary>Indicates that <c>NULL</c> values are allowed.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -1534,7 +1541,7 @@
       </ReturnValue>
       <MemberValue>2</MemberValue>
       <Docs>
-        <summary>Indicates that whether &lt;code&gt;NULL&lt;/code&gt; values are allowed
+        <summary>Indicates that whether <c>NULL</c> values are allowed
             is unknown.</summary>
         <remarks>
           <para>
@@ -1687,11 +1694,11 @@
       <Docs>
         <param name="catalog">a catalog name; must match the catalog name as it
                    is stored in the database; "" retrieves those without a catalog;
-                   &lt;code&gt;null&lt;/code&gt; means that the catalog name should not be used to narrow
+                   <c>null</c> means that the catalog name should not be used to narrow
                    the search</param>
         <param name="schemaPattern">a schema name pattern; must match the schema name
                    as it is stored in the database; "" retrieves those without a schema;
-                   &lt;code&gt;null&lt;/code&gt; means that the schema name should not be used to narrow
+                   <c>null</c> means that the schema name should not be used to narrow
                    the search</param>
         <param name="typeNamePattern">a type name pattern; must match the
                    type name as it is stored in the database</param>
@@ -1700,7 +1707,7 @@
         <summary>Retrieves a description of the given attribute of the given type
             for a user-defined type (UDT) that is available in the given schema
             and catalog.</summary>
-        <returns>a &lt;code&gt;ResultSet&lt;/code&gt; object in which each row is an
+        <returns>a <c>ResultSet</c> object in which each row is an
                     attribute description</returns>
         <remarks>
           <para>
@@ -1748,11 +1755,11 @@
       <Docs>
         <param name="catalog">a catalog name; must match the catalog name as it
                    is stored in the database; "" retrieves those without a catalog;
-                   &lt;code&gt;null&lt;/code&gt; means that the catalog name should not be used to narrow
+                   <c>null</c> means that the catalog name should not be used to narrow
                    the search</param>
         <param name="schema">a schema name; must match the schema name
                    as it is stored in the database; "" retrieves those without a schema;
-                   &lt;code&gt;null&lt;/code&gt; means that the schema name should not be used to narrow
+                   <c>null</c> means that the schema name should not be used to narrow
                    the search</param>
         <param name="table">a table name; must match the table name as it is stored
                    in the database</param>
@@ -1760,7 +1767,8 @@
         <param name="nullable">include columns that are nullable.</param>
         <summary>Retrieves a description of a table's optimal set of columns that
             uniquely identifies a row.</summary>
-        <returns>&lt;code&gt;ResultSet&lt;/code&gt; - each row is a column description</returns>
+        <returns>
+          <c>ResultSet</c> - each row is a column description</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1806,18 +1814,19 @@
       <Docs>
         <param name="catalog">a catalog name; must match the catalog name as it
                    is stored in the database; "" retrieves those without a catalog;
-                   &lt;code&gt;null&lt;/code&gt; means that the catalog name should not be used to narrow
+                   <c>null</c> means that the catalog name should not be used to narrow
                    the search</param>
         <param name="schema">a schema name; must match the schema name as it is
                    stored in the database; "" retrieves those without a schema;
-                   &lt;code&gt;null&lt;/code&gt; means that the schema name should not be used to narrow
+                   <c>null</c> means that the schema name should not be used to narrow
                    the search</param>
         <param name="table">a table name; must match the table name as it is
                    stored in the database</param>
         <param name="columnNamePattern">a column name pattern; must match the column
                    name as it is stored in the database</param>
         <summary>Retrieves a description of the access rights for a table's columns.</summary>
-        <returns>&lt;code&gt;ResultSet&lt;/code&gt; - each row is a column privilege description</returns>
+        <returns>
+          <c>ResultSet</c> - each row is a column privilege description</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1863,11 +1872,11 @@
       <Docs>
         <param name="catalog">a catalog name; must match the catalog name as it
                    is stored in the database; "" retrieves those without a catalog;
-                   &lt;code&gt;null&lt;/code&gt; means that the catalog name should not be used to narrow
+                   <c>null</c> means that the catalog name should not be used to narrow
                    the search</param>
         <param name="schemaPattern">a schema name pattern; must match the schema name
                    as it is stored in the database; "" retrieves those without a schema;
-                   &lt;code&gt;null&lt;/code&gt; means that the schema name should not be used to narrow
+                   <c>null</c> means that the schema name should not be used to narrow
                    the search</param>
         <param name="tableNamePattern">a table name pattern; must match the
                    table name as it is stored in the database</param>
@@ -1875,7 +1884,8 @@
                    name as it is stored in the database</param>
         <summary>Retrieves a description of table columns available in
             the specified catalog.</summary>
-        <returns>&lt;code&gt;ResultSet&lt;/code&gt; - each row is a column description</returns>
+        <returns>
+          <c>ResultSet</c> - each row is a column description</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1923,23 +1933,24 @@
       <Docs>
         <param name="parentCatalog">a catalog name; must match the catalog name
             as it is stored in the database; "" retrieves those without a
-            catalog; &lt;code&gt;null&lt;/code&gt; means drop catalog name from the selection criteria</param>
+            catalog; <c>null</c> means drop catalog name from the selection criteria</param>
         <param name="parentSchema">a schema name; must match the schema name as
             it is stored in the database; "" retrieves those without a schema;
-            &lt;code&gt;null&lt;/code&gt; means drop schema name from the selection criteria</param>
+            <c>null</c> means drop schema name from the selection criteria</param>
         <param name="parentTable">the name of the table that exports the key; must match
             the table name as it is stored in the database</param>
         <param name="foreignCatalog">a catalog name; must match the catalog name as
             it is stored in the database; "" retrieves those without a
-            catalog; &lt;code&gt;null&lt;/code&gt; means drop catalog name from the selection criteria</param>
+            catalog; <c>null</c> means drop catalog name from the selection criteria</param>
         <param name="foreignSchema">a schema name; must match the schema name as it
             is stored in the database; "" retrieves those without a schema;
-            &lt;code&gt;null&lt;/code&gt; means drop schema name from the selection criteria</param>
+            <c>null</c> means drop schema name from the selection criteria</param>
         <param name="foreignTable">the name of the table that imports the key; must match
             the table name as it is stored in the database</param>
         <summary>Retrieves a description of the foreign key columns in the given foreign key
             table that reference the primary key or the columns representing a unique constraint of the  parent table (could be the same or a different table).</summary>
-        <returns>&lt;code&gt;ResultSet&lt;/code&gt; - each row is a foreign key column description</returns>
+        <returns>
+          <c>ResultSet</c> - each row is a foreign key column description</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1984,18 +1995,18 @@
       <Docs>
         <param name="catalog">a catalog name; must match the catalog name as it
                    is stored in this database; "" retrieves those without a catalog;
-                   &lt;code&gt;null&lt;/code&gt; means that the catalog name should not be used to narrow
+                   <c>null</c> means that the catalog name should not be used to narrow
                    the search</param>
         <param name="schema">a schema name; must match the schema name
                    as it is stored in the database; "" retrieves those without a schema;
-                   &lt;code&gt;null&lt;/code&gt; means that the schema name should not be used to narrow
+                   <c>null</c> means that the schema name should not be used to narrow
                    the search</param>
         <param name="table">a table name; must match the table name as it is stored
                    in this database</param>
         <summary>Retrieves a description of the foreign key columns that reference the
             given table's primary key columns (the foreign keys exported by a
             table).</summary>
-        <returns>a &lt;code&gt;ResultSet&lt;/code&gt; object in which each row is a
+        <returns>a <c>ResultSet</c> object in which each row is a
                     foreign key column description</returns>
         <remarks>
           <para>
@@ -2042,11 +2053,11 @@
       <Docs>
         <param name="catalog">a catalog name; must match the catalog name as it
                    is stored in the database; "" retrieves those without a catalog;
-                   &lt;code&gt;null&lt;/code&gt; means that the catalog name should not be used to narrow
+                   <c>null</c> means that the catalog name should not be used to narrow
                    the search</param>
         <param name="schemaPattern">a schema name pattern; must match the schema name
                    as it is stored in the database; "" retrieves those without a schema;
-                   &lt;code&gt;null&lt;/code&gt; means that the schema name should not be used to narrow
+                   <c>null</c> means that the schema name should not be used to narrow
                    the search</param>
         <param name="functionNamePattern">a procedure name pattern; must match the
                    function name as it is stored in the database</param>
@@ -2054,7 +2065,8 @@
             parameter or column name as it is stored in the database</param>
         <summary>Retrieves a description of the given catalog's system or user
             function parameters and return type.</summary>
-        <returns>&lt;code&gt;ResultSet&lt;/code&gt; - each row describes a
+        <returns>
+          <c>ResultSet</c> - each row describes a
             user function parameter, column  or return type</returns>
         <remarks>
           <para>
@@ -2100,17 +2112,18 @@
       <Docs>
         <param name="catalog">a catalog name; must match the catalog name as it
                    is stored in the database; "" retrieves those without a catalog;
-                   &lt;code&gt;null&lt;/code&gt; means that the catalog name should not be used to narrow
+                   <c>null</c> means that the catalog name should not be used to narrow
                    the search</param>
         <param name="schemaPattern">a schema name pattern; must match the schema name
                    as it is stored in the database; "" retrieves those without a schema;
-                   &lt;code&gt;null&lt;/code&gt; means that the schema name should not be used to narrow
+                   <c>null</c> means that the schema name should not be used to narrow
                    the search</param>
         <param name="functionNamePattern">a function name pattern; must match the
                    function name as it is stored in the database</param>
         <summary>Retrieves a description of the  system and user functions available
             in the given catalog.</summary>
-        <returns>&lt;code&gt;ResultSet&lt;/code&gt; - each row is a function description</returns>
+        <returns>
+          <c>ResultSet</c> - each row is a function description</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -2155,18 +2168,19 @@
       <Docs>
         <param name="catalog">a catalog name; must match the catalog name as it
                    is stored in the database; "" retrieves those without a catalog;
-                   &lt;code&gt;null&lt;/code&gt; means that the catalog name should not be used to narrow
+                   <c>null</c> means that the catalog name should not be used to narrow
                    the search</param>
         <param name="schema">a schema name; must match the schema name
                    as it is stored in the database; "" retrieves those without a schema;
-                   &lt;code&gt;null&lt;/code&gt; means that the schema name should not be used to narrow
+                   <c>null</c> means that the schema name should not be used to narrow
                    the search</param>
         <param name="table">a table name; must match the table name as it is stored
                    in the database</param>
         <summary>Retrieves a description of the primary key columns that are
             referenced by the given table's foreign key columns (the primary keys
             imported by a table).</summary>
-        <returns>&lt;code&gt;ResultSet&lt;/code&gt; - each row is a primary key column description</returns>
+        <returns>
+          <c>ResultSet</c> - each row is a primary key column description</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -2213,11 +2227,11 @@
       <Docs>
         <param name="catalog">a catalog name; must match the catalog name as it
                    is stored in this database; "" retrieves those without a catalog;
-                   &lt;code&gt;null&lt;/code&gt; means that the catalog name should not be used to narrow
+                   <c>null</c> means that the catalog name should not be used to narrow
                    the search</param>
         <param name="schema">a schema name; must match the schema name
                    as it is stored in this database; "" retrieves those without a schema;
-                   &lt;code&gt;null&lt;/code&gt; means that the schema name should not be used to narrow
+                   <c>null</c> means that the schema name should not be used to narrow
                    the search</param>
         <param name="table">a table name; must match the table name as it is stored
                    in this database</param>
@@ -2227,7 +2241,8 @@
                 or out of data values; when false, results are requested to be
                 accurate</param>
         <summary>Retrieves a description of the given table's indices and statistics.</summary>
-        <returns>&lt;code&gt;ResultSet&lt;/code&gt; - each row is an index column description</returns>
+        <returns>
+          <c>ResultSet</c> - each row is an index column description</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -2272,16 +2287,17 @@
       <Docs>
         <param name="catalog">a catalog name; must match the catalog name as it
                    is stored in the database; "" retrieves those without a catalog;
-                   &lt;code&gt;null&lt;/code&gt; means that the catalog name should not be used to narrow
+                   <c>null</c> means that the catalog name should not be used to narrow
                    the search</param>
         <param name="schema">a schema name; must match the schema name
                    as it is stored in the database; "" retrieves those without a schema;
-                   &lt;code&gt;null&lt;/code&gt; means that the schema name should not be used to narrow
+                   <c>null</c> means that the schema name should not be used to narrow
                    the search</param>
         <param name="table">a table name; must match the table name as it is stored
                    in the database</param>
         <summary>Retrieves a description of the given table's primary key columns.</summary>
-        <returns>&lt;code&gt;ResultSet&lt;/code&gt; - each row is a primary key column description</returns>
+        <returns>
+          <c>ResultSet</c> - each row is a primary key column description</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -2327,11 +2343,11 @@
       <Docs>
         <param name="catalog">a catalog name; must match the catalog name as it
                    is stored in the database; "" retrieves those without a catalog;
-                   &lt;code&gt;null&lt;/code&gt; means that the catalog name should not be used to narrow
+                   <c>null</c> means that the catalog name should not be used to narrow
                    the search</param>
         <param name="schemaPattern">a schema name pattern; must match the schema name
                    as it is stored in the database; "" retrieves those without a schema;
-                   &lt;code&gt;null&lt;/code&gt; means that the schema name should not be used to narrow
+                   <c>null</c> means that the schema name should not be used to narrow
                    the search</param>
         <param name="procedureNamePattern">a procedure name pattern; must match the
                    procedure name as it is stored in the database</param>
@@ -2339,7 +2355,8 @@
                    as it is stored in the database</param>
         <summary>Retrieves a description of the given catalog's stored procedure parameter
             and result columns.</summary>
-        <returns>&lt;code&gt;ResultSet&lt;/code&gt; - each row describes a stored procedure parameter or
+        <returns>
+          <c>ResultSet</c> - each row describes a stored procedure parameter or
                  column</returns>
         <remarks>
           <para>
@@ -2385,17 +2402,18 @@
       <Docs>
         <param name="catalog">a catalog name; must match the catalog name as it
                    is stored in the database; "" retrieves those without a catalog;
-                   &lt;code&gt;null&lt;/code&gt; means that the catalog name should not be used to narrow
+                   <c>null</c> means that the catalog name should not be used to narrow
                    the search</param>
         <param name="schemaPattern">a schema name pattern; must match the schema name
                    as it is stored in the database; "" retrieves those without a schema;
-                   &lt;code&gt;null&lt;/code&gt; means that the schema name should not be used to narrow
+                   <c>null</c> means that the schema name should not be used to narrow
                    the search</param>
         <param name="procedureNamePattern">a procedure name pattern; must match the
                    procedure name as it is stored in the database</param>
         <summary>Retrieves a description of the stored procedures available in the given
             catalog.</summary>
-        <returns>&lt;code&gt;ResultSet&lt;/code&gt; - each row is a procedure description</returns>
+        <returns>
+          <c>ResultSet</c> - each row is a procedure description</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -2444,7 +2462,7 @@
             stored in the database; null means
             schema name should not be used to narrow down the search.</param>
         <summary>Retrieves the schema names available in this database.</summary>
-        <returns>a &lt;code&gt;ResultSet&lt;/code&gt; object in which each row is a
+        <returns>a <c>ResultSet</c> object in which each row is a
                     schema description</returns>
         <remarks>
           <para>
@@ -2489,14 +2507,14 @@
       </Parameters>
       <Docs>
         <param name="catalog">a catalog name; "" retrieves those without a catalog;
-                   &lt;code&gt;null&lt;/code&gt; means drop catalog name from the selection criteria</param>
+                   <c>null</c> means drop catalog name from the selection criteria</param>
         <param name="schemaPattern">a schema name pattern; "" retrieves those
                    without a schema</param>
         <param name="tableNamePattern">a table name pattern; may be a fully-qualified
                    name</param>
         <summary>Retrieves a description of the table hierarchies defined in a particular
             schema in this database.</summary>
-        <returns>a &lt;code&gt;ResultSet&lt;/code&gt; object in which each row is a type description</returns>
+        <returns>a <c>ResultSet</c> object in which each row is a type description</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -2540,14 +2558,14 @@
       </Parameters>
       <Docs>
         <param name="catalog">a catalog name; "" retrieves those without a catalog;
-                   &lt;code&gt;null&lt;/code&gt; means drop catalog name from the selection criteria</param>
+                   <c>null</c> means drop catalog name from the selection criteria</param>
         <param name="schemaPattern">a schema name pattern; "" retrieves those
                    without a schema</param>
         <param name="typeNamePattern">a UDT name pattern; may be a fully-qualified
                    name</param>
         <summary>Retrieves a description of the user-defined type (UDT) hierarchies defined in a
             particular schema in this database.</summary>
-        <returns>a &lt;code&gt;ResultSet&lt;/code&gt; object in which a row gives information
+        <returns>a <c>ResultSet</c> object in which a row gives information
                     about the designated UDT</returns>
         <remarks>
           <para>
@@ -2593,17 +2611,18 @@
       <Docs>
         <param name="catalog">a catalog name; must match the catalog name as it
                    is stored in the database; "" retrieves those without a catalog;
-                   &lt;code&gt;null&lt;/code&gt; means that the catalog name should not be used to narrow
+                   <c>null</c> means that the catalog name should not be used to narrow
                    the search</param>
         <param name="schemaPattern">a schema name pattern; must match the schema name
                    as it is stored in the database; "" retrieves those without a schema;
-                   &lt;code&gt;null&lt;/code&gt; means that the schema name should not be used to narrow
+                   <c>null</c> means that the schema name should not be used to narrow
                    the search</param>
         <param name="tableNamePattern">a table name pattern; must match the
                    table name as it is stored in the database</param>
         <summary>Retrieves a description of the access rights for each table available
             in a catalog.</summary>
-        <returns>&lt;code&gt;ResultSet&lt;/code&gt; - each row is a table privilege description</returns>
+        <returns>
+          <c>ResultSet</c> - each row is a table privilege description</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -2649,19 +2668,20 @@
       <Docs>
         <param name="catalog">a catalog name; must match the catalog name as it
                    is stored in the database; "" retrieves those without a catalog;
-                   &lt;code&gt;null&lt;/code&gt; means that the catalog name should not be used to narrow
+                   <c>null</c> means that the catalog name should not be used to narrow
                    the search</param>
         <param name="schemaPattern">a schema name pattern; must match the schema name
                    as it is stored in the database; "" retrieves those without a schema;
-                   &lt;code&gt;null&lt;/code&gt; means that the schema name should not be used to narrow
+                   <c>null</c> means that the schema name should not be used to narrow
                    the search</param>
         <param name="tableNamePattern">a table name pattern; must match the
                    table name as it is stored in the database</param>
         <param name="types">a list of table types, which must be from the list of table types
-                    returned from <c>#getTableTypes</c>,to include; &lt;code&gt;null&lt;/code&gt; returns
+                    returned from <c>#getTableTypes</c>,to include; <c>null</c> returns
             all types</param>
         <summary>Retrieves a description of the tables available in the given catalog.</summary>
-        <returns>&lt;code&gt;ResultSet&lt;/code&gt; - each row is a table description</returns>
+        <returns>
+          <c>ResultSet</c> - each row is a table description</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -2707,19 +2727,20 @@
       <Docs>
         <param name="catalog">a catalog name; must match the catalog name as it
                    is stored in the database; "" retrieves those without a catalog;
-                   &lt;code&gt;null&lt;/code&gt; means that the catalog name should not be used to narrow
+                   <c>null</c> means that the catalog name should not be used to narrow
                    the search</param>
         <param name="schemaPattern">a schema pattern name; must match the schema name
                    as it is stored in the database; "" retrieves those without a schema;
-                   &lt;code&gt;null&lt;/code&gt; means that the schema name should not be used to narrow
+                   <c>null</c> means that the schema name should not be used to narrow
                    the search</param>
         <param name="typeNamePattern">a type name pattern; must match the type name
                    as it is stored in the database; may be a fully qualified name</param>
         <param name="types">a list of user-defined types (JAVA_OBJECT,
-                   STRUCT, or DISTINCT) to include; &lt;code&gt;null&lt;/code&gt; returns all types</param>
+                   STRUCT, or DISTINCT) to include; <c>null</c> returns all types</param>
         <summary>Retrieves a description of the user-defined types (UDTs) defined
             in a particular schema.</summary>
-        <returns>&lt;code&gt;ResultSet&lt;/code&gt; object in which each row describes a UDT</returns>
+        <returns>
+          <c>ResultSet</c> object in which each row describes a UDT</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -2764,17 +2785,17 @@
       <Docs>
         <param name="catalog">a catalog name; must match the catalog name as it
                    is stored in the database; "" retrieves those without a catalog;
-                   &lt;code&gt;null&lt;/code&gt; means that the catalog name should not be used to narrow
+                   <c>null</c> means that the catalog name should not be used to narrow
                    the search</param>
         <param name="schema">a schema name; must match the schema name
                    as it is stored in the database; "" retrieves those without a schema;
-                   &lt;code&gt;null&lt;/code&gt; means that the schema name should not be used to narrow
+                   <c>null</c> means that the schema name should not be used to narrow
                    the search</param>
         <param name="table">a table name; must match the table name as it is stored
                    in the database</param>
         <summary>Retrieves a description of a table's columns that are automatically
             updated when any value in a row is updated.</summary>
-        <returns>a &lt;code&gt;ResultSet&lt;/code&gt; object in which each row is a
+        <returns>a <c>ResultSet</c> object in which each row is a
                     column description</returns>
         <remarks>
           <para>
@@ -2844,7 +2865,7 @@
       </ReturnValue>
       <MemberValue>0</MemberValue>
       <Docs>
-        <summary>For the column &lt;code&gt;UPDATE_RULE&lt;/code&gt;,
+        <summary>For the column <c>UPDATE_RULE</c>,
             indicates that
             when the primary key is updated, the foreign key (imported key)
             is changed to agree with it.</summary>
@@ -2955,8 +2976,8 @@
       </ReturnValue>
       <MemberValue>3</MemberValue>
       <Docs>
-        <summary>For the columns &lt;code&gt;UPDATE_RULE&lt;/code&gt;
-            and &lt;code&gt;DELETE_RULE&lt;/code&gt;, indicates that
+        <summary>For the columns <c>UPDATE_RULE</c>
+            and <c>DELETE_RULE</c>, indicates that
             if the primary key has been imported, it cannot be updated or deleted.</summary>
         <remarks>
           <para>
@@ -3029,7 +3050,7 @@
       </ReturnValue>
       <MemberValue>1</MemberValue>
       <Docs>
-        <summary>For the column &lt;code&gt;UPDATE_RULE&lt;/code&gt;, indicates that
+        <summary>For the column <c>UPDATE_RULE</c>, indicates that
             a primary key may not be updated if it has been imported by
             another table as a foreign key.</summary>
         <remarks>
@@ -3067,8 +3088,8 @@
       </ReturnValue>
       <MemberValue>4</MemberValue>
       <Docs>
-        <summary>For the columns &lt;code&gt;UPDATE_RULE&lt;/code&gt;
-            and &lt;code&gt;DELETE_RULE&lt;/code&gt;, indicates that
+        <summary>For the columns <c>UPDATE_RULE</c>
+            and <c>DELETE_RULE</c>, indicates that
             if the primary key is updated or deleted, the foreign key (imported key)
             is set to the default value.</summary>
         <remarks>
@@ -3106,10 +3127,10 @@
       </ReturnValue>
       <MemberValue>2</MemberValue>
       <Docs>
-        <summary>For the columns &lt;code&gt;UPDATE_RULE&lt;/code&gt;
-            and &lt;code&gt;DELETE_RULE&lt;/code&gt;, indicates that
+        <summary>For the columns <c>UPDATE_RULE</c>
+            and <c>DELETE_RULE</c>, indicates that
             when the primary key is updated or deleted, the foreign key (imported key)
-            is changed to &lt;code&gt;NULL&lt;/code&gt;.</summary>
+            is changed to <c>NULL</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -3147,14 +3168,15 @@
         <Parameter Name="type" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="type">the &lt;code&gt;ResultSet&lt;/code&gt; type; one of
-                   &lt;code&gt;ResultSet.TYPE_FORWARD_ONLY&lt;/code&gt;,
-                   &lt;code&gt;ResultSet.TYPE_SCROLL_INSENSITIVE&lt;/code&gt;, or
-                   &lt;code&gt;ResultSet.TYPE_SCROLL_SENSITIVE&lt;/code&gt;</param>
+        <param name="type">the <c>ResultSet</c> type; one of
+                   <c>ResultSet.TYPE_FORWARD_ONLY</c>,
+                   <c>ResultSet.TYPE_SCROLL_INSENSITIVE</c>, or
+                   <c>ResultSet.TYPE_SCROLL_SENSITIVE</c></param>
         <summary>Retrieves whether or not a visible row insert can be detected
-            by calling the method &lt;code&gt;ResultSet.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if changes are detected by the specified result
-                    set type; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+            by calling the method <c>ResultSet.rowInserted</c>.</summary>
+        <returns>
+          <c>true</c> if changes are detected by the specified result
+                    set type; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -3315,8 +3337,9 @@
       <Docs>
         <summary>Indicates whether updates made to a LOB are made on a copy or directly
             to the LOB.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if updates are made to a copy of the LOB;
-                    &lt;code&gt;false&lt;/code&gt; if updates are made directly to the LOB</returns>
+        <returns>
+          <c>true</c> if updates are made to a copy of the LOB;
+                    <c>false</c> if updates are made directly to the LOB</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -3966,9 +3989,10 @@
       <Parameters />
       <Docs>
         <summary>Retrieves whether this database supports concatenations between
-            &lt;code&gt;NULL&lt;/code&gt; and non-&lt;code&gt;NULL&lt;/code&gt; values being
-            &lt;code&gt;NULL&lt;/code&gt;.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+            <c>NULL</c> and non-<c>NULL</c> values being
+            <c>NULL</c>.</summary>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -4007,9 +4031,10 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Retrieves whether &lt;code&gt;NULL&lt;/code&gt; values are sorted at the end regardless of
+        <summary>Retrieves whether <c>NULL</c> values are sorted at the end regardless of
             sort order.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -4048,9 +4073,10 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Retrieves whether &lt;code&gt;NULL&lt;/code&gt; values are sorted at the start regardless
+        <summary>Retrieves whether <c>NULL</c> values are sorted at the start regardless
             of sort order.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -4089,8 +4115,9 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Retrieves whether &lt;code&gt;NULL&lt;/code&gt; values are sorted high.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <summary>Retrieves whether <c>NULL</c> values are sorted high.</summary>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -4129,8 +4156,9 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Retrieves whether &lt;code&gt;NULL&lt;/code&gt; values are sorted low.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <summary>Retrieves whether <c>NULL</c> values are sorted low.</summary>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -4201,14 +4229,15 @@
         <Parameter Name="type" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="type">the &lt;code&gt;ResultSet&lt;/code&gt; type; one of
-                   &lt;code&gt;ResultSet.TYPE_FORWARD_ONLY&lt;/code&gt;,
-                   &lt;code&gt;ResultSet.TYPE_SCROLL_INSENSITIVE&lt;/code&gt;, or
-                   &lt;code&gt;ResultSet.TYPE_SCROLL_SENSITIVE&lt;/code&gt;</param>
+        <param name="type">the <c>ResultSet</c> type; one of
+                   <c>ResultSet.TYPE_FORWARD_ONLY</c>,
+                   <c>ResultSet.TYPE_SCROLL_INSENSITIVE</c>, or
+                   <c>ResultSet.TYPE_SCROLL_SENSITIVE</c></param>
         <summary>Retrieves whether deletes made by others are visible.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if deletes made by others
+        <returns>
+          <c>true</c> if deletes made by others
                    are visible for the given result set type;
-                   &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+                   <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -4249,14 +4278,15 @@
         <Parameter Name="type" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="type">the &lt;code&gt;ResultSet&lt;/code&gt; type; one of
-                   &lt;code&gt;ResultSet.TYPE_FORWARD_ONLY&lt;/code&gt;,
-                   &lt;code&gt;ResultSet.TYPE_SCROLL_INSENSITIVE&lt;/code&gt;, or
-                   &lt;code&gt;ResultSet.TYPE_SCROLL_SENSITIVE&lt;/code&gt;</param>
+        <param name="type">the <c>ResultSet</c> type; one of
+                   <c>ResultSet.TYPE_FORWARD_ONLY</c>,
+                   <c>ResultSet.TYPE_SCROLL_INSENSITIVE</c>, or
+                   <c>ResultSet.TYPE_SCROLL_SENSITIVE</c></param>
         <summary>Retrieves whether inserts made by others are visible.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if inserts made by others
+        <returns>
+          <c>true</c> if inserts made by others
                     are visible for the given result set type;
-                    &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+                    <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -4297,14 +4327,15 @@
         <Parameter Name="type" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="type">the &lt;code&gt;ResultSet&lt;/code&gt; type; one of
-                   &lt;code&gt;ResultSet.TYPE_FORWARD_ONLY&lt;/code&gt;,
-                   &lt;code&gt;ResultSet.TYPE_SCROLL_INSENSITIVE&lt;/code&gt;, or
-                   &lt;code&gt;ResultSet.TYPE_SCROLL_SENSITIVE&lt;/code&gt;</param>
+        <param name="type">the <c>ResultSet</c> type; one of
+                   <c>ResultSet.TYPE_FORWARD_ONLY</c>,
+                   <c>ResultSet.TYPE_SCROLL_INSENSITIVE</c>, or
+                   <c>ResultSet.TYPE_SCROLL_SENSITIVE</c></param>
         <summary>Retrieves whether updates made by others are visible.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if updates made by others
+        <returns>
+          <c>true</c> if updates made by others
                    are visible for the given result set type;
-                   &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+                   <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -4345,13 +4376,14 @@
         <Parameter Name="type" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="type">the &lt;code&gt;ResultSet&lt;/code&gt; type; one of
-                   &lt;code&gt;ResultSet.TYPE_FORWARD_ONLY&lt;/code&gt;,
-                   &lt;code&gt;ResultSet.TYPE_SCROLL_INSENSITIVE&lt;/code&gt;, or
-                   &lt;code&gt;ResultSet.TYPE_SCROLL_SENSITIVE&lt;/code&gt;</param>
+        <param name="type">the <c>ResultSet</c> type; one of
+                   <c>ResultSet.TYPE_FORWARD_ONLY</c>,
+                   <c>ResultSet.TYPE_SCROLL_INSENSITIVE</c>, or
+                   <c>ResultSet.TYPE_SCROLL_SENSITIVE</c></param>
         <summary>Retrieves whether a result set's own deletes are visible.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if deletes are visible for the given result set type;
-                   &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if deletes are visible for the given result set type;
+                   <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -4392,13 +4424,14 @@
         <Parameter Name="type" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="type">the &lt;code&gt;ResultSet&lt;/code&gt; type; one of
-                   &lt;code&gt;ResultSet.TYPE_FORWARD_ONLY&lt;/code&gt;,
-                   &lt;code&gt;ResultSet.TYPE_SCROLL_INSENSITIVE&lt;/code&gt;, or
-                   &lt;code&gt;ResultSet.TYPE_SCROLL_SENSITIVE&lt;/code&gt;</param>
+        <param name="type">the <c>ResultSet</c> type; one of
+                   <c>ResultSet.TYPE_FORWARD_ONLY</c>,
+                   <c>ResultSet.TYPE_SCROLL_INSENSITIVE</c>, or
+                   <c>ResultSet.TYPE_SCROLL_SENSITIVE</c></param>
         <summary>Retrieves whether a result set's own inserts are visible.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if inserts are visible for the given result set type;
-                   &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if inserts are visible for the given result set type;
+                   <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -4439,14 +4472,15 @@
         <Parameter Name="type" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="type">the &lt;code&gt;ResultSet&lt;/code&gt; type; one of
-                   &lt;code&gt;ResultSet.TYPE_FORWARD_ONLY&lt;/code&gt;,
-                   &lt;code&gt;ResultSet.TYPE_SCROLL_INSENSITIVE&lt;/code&gt;, or
-                   &lt;code&gt;ResultSet.TYPE_SCROLL_SENSITIVE&lt;/code&gt;</param>
-        <summary>Retrieves whether for the given type of &lt;code&gt;ResultSet&lt;/code&gt; object,
+        <param name="type">the <c>ResultSet</c> type; one of
+                   <c>ResultSet.TYPE_FORWARD_ONLY</c>,
+                   <c>ResultSet.TYPE_SCROLL_INSENSITIVE</c>, or
+                   <c>ResultSet.TYPE_SCROLL_SENSITIVE</c></param>
+        <summary>Retrieves whether for the given type of <c>ResultSet</c> object,
             the result set's own updates are visible.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if updates are visible for the given result set type;
-                   &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if updates are visible for the given result set type;
+                   <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -4701,7 +4735,7 @@
       </ReturnValue>
       <MemberValue>0</MemberValue>
       <Docs>
-        <summary>Indicates that &lt;code&gt;NULL&lt;/code&gt; values are not allowed.</summary>
+        <summary>Indicates that <c>NULL</c> values are not allowed.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -4773,7 +4807,7 @@
       </ReturnValue>
       <MemberValue>1</MemberValue>
       <Docs>
-        <summary>Indicates that &lt;code&gt;NULL&lt;/code&gt; values are allowed.</summary>
+        <summary>Indicates that <c>NULL</c> values are allowed.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -4809,7 +4843,7 @@
       </ReturnValue>
       <MemberValue>2</MemberValue>
       <Docs>
-        <summary>Indicates that whether &lt;code&gt;NULL&lt;/code&gt; values are allowed
+        <summary>Indicates that whether <c>NULL</c> values are allowed
             is unknown.</summary>
         <remarks>
           <para>
@@ -5132,7 +5166,9 @@
       <MemberValue>2</MemberValue>
       <Docs>
         <summary>A possible return value for the method
-            &lt;code&gt;DatabaseMetaData.</summary>
+            <c>DatabaseMetaData.getSQLStateType</c> which is used to indicate
+            whether the value returned by the method
+            <c>SQLException.getSQLState</c> is an SQLSTATE value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -5169,7 +5205,9 @@
       <MemberValue>2</MemberValue>
       <Docs>
         <summary>A possible return value for the method
-            &lt;code&gt;DatabaseMetaData.</summary>
+            <c>DatabaseMetaData.getSQLStateType</c> which is used to indicate
+            whether the value returned by the method
+            <c>SQLException.getSQLState</c> is an SQL99 SQLSTATE value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -5236,7 +5274,10 @@
       <MemberValue>1</MemberValue>
       <Docs>
         <summary>A possible return value for the method
-            &lt;code&gt;DatabaseMetaData.</summary>
+            <c>DatabaseMetaData.getSQLStateType</c> which is used to indicate
+            whether the value returned by the method
+            <c>SQLException.getSQLState</c> is an
+            X/Open (now know as Open Group) SQL CLI SQLSTATE value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -5274,7 +5315,8 @@
       <Docs>
         <summary>Retrieves whether this database treats mixed case unquoted SQL identifiers as
             case insensitive and stores them in lower case.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -5315,7 +5357,8 @@
       <Docs>
         <summary>Retrieves whether this database treats mixed case quoted SQL identifiers as
             case insensitive and stores them in lower case.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -5356,7 +5399,8 @@
       <Docs>
         <summary>Retrieves whether this database treats mixed case unquoted SQL identifiers as
             case insensitive and stores them in mixed case.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -5397,7 +5441,8 @@
       <Docs>
         <summary>Retrieves whether this database treats mixed case quoted SQL identifiers as
             case insensitive and stores them in mixed case.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -5438,7 +5483,8 @@
       <Docs>
         <summary>Retrieves whether this database treats mixed case unquoted SQL identifiers as
             case insensitive and stores them in upper case.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -5479,7 +5525,8 @@
       <Docs>
         <summary>Retrieves whether this database treats mixed case quoted SQL identifiers as
             case insensitive and stores them in upper case.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -5548,9 +5595,10 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Retrieves whether this database supports &lt;code&gt;ALTER TABLE&lt;/code&gt;
+        <summary>Retrieves whether this database supports <c>ALTER TABLE</c>
             with add column.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -5589,9 +5637,10 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Retrieves whether this database supports &lt;code&gt;ALTER TABLE&lt;/code&gt;
+        <summary>Retrieves whether this database supports <c>ALTER TABLE</c>
             with drop column.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -5632,7 +5681,8 @@
       <Docs>
         <summary>Retrieves whether this database supports the ANSI92 entry level SQL
             grammar.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -5672,7 +5722,8 @@
       <Parameters />
       <Docs>
         <summary>Retrieves whether this database supports the ANSI92 full SQL grammar supported.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -5712,7 +5763,8 @@
       <Parameters />
       <Docs>
         <summary>Retrieves whether this database supports the ANSI92 intermediate SQL grammar supported.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -5752,8 +5804,9 @@
       <Parameters />
       <Docs>
         <summary>Retrieves whether this database supports batch updates.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if this database supports batch upcates;
-                    &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if this database supports batch upcates;
+                    <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -5793,7 +5846,8 @@
       <Parameters />
       <Docs>
         <summary>Retrieves whether a catalog name can be used in a data manipulation statement.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -5833,7 +5887,8 @@
       <Parameters />
       <Docs>
         <summary>Retrieves whether a catalog name can be used in an index definition statement.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -5873,7 +5928,8 @@
       <Parameters />
       <Docs>
         <summary>Retrieves whether a catalog name can be used in a privilege definition statement.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -5913,7 +5969,8 @@
       <Parameters />
       <Docs>
         <summary>Retrieves whether a catalog name can be used in a procedure call statement.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -5953,7 +6010,8 @@
       <Parameters />
       <Docs>
         <summary>Retrieves whether a catalog name can be used in a table definition statement.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -5993,7 +6051,8 @@
       <Parameters />
       <Docs>
         <summary>Retrieves whether this database supports column aliasing.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -6033,8 +6092,9 @@
       <Parameters />
       <Docs>
         <summary>Retrieves whether this database supports the JDBC scalar function
-            &lt;code&gt;CONVERT&lt;/code&gt; for the conversion of one JDBC type to another.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+            <c>CONVERT</c> for the conversion of one JDBC type to another.</summary>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -6077,13 +6137,14 @@
       </Parameters>
       <Docs>
         <param name="fromType">the type to convert from; one of the type codes from
-                   the class &lt;code&gt;java.sql.Types&lt;/code&gt;</param>
+                   the class <c>java.sql.Types</c></param>
         <param name="toType">the type to convert to; one of the type codes from
-                   the class &lt;code&gt;java.sql.Types&lt;/code&gt;</param>
+                   the class <c>java.sql.Types</c></param>
         <summary>Retrieves whether this database supports the JDBC scalar function
-            &lt;code&gt;CONVERT&lt;/code&gt; for conversions between the JDBC types <i>fromType</i>
+            <c>CONVERT</c> for conversions between the JDBC types <i>fromType</i>
             and <i>toType</i>.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -6123,7 +6184,8 @@
       <Parameters />
       <Docs>
         <summary>Retrieves whether this database supports the ODBC Core SQL grammar.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -6163,7 +6225,8 @@
       <Parameters />
       <Docs>
         <summary>Retrieves whether this database supports correlated subqueries.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -6204,7 +6267,8 @@
       <Docs>
         <summary>Retrieves whether this database supports both data definition and
             data manipulation statements within a transaction.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -6245,7 +6309,8 @@
       <Docs>
         <summary>Retrieves whether this database supports only data manipulation
             statements within a transaction.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -6286,7 +6351,8 @@
       <Docs>
         <summary>Retrieves whether, when table correlation names are supported, they
             are restricted to being different from the names of the tables.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -6326,8 +6392,9 @@
       <Parameters />
       <Docs>
         <summary>Retrieves whether this database supports expressions in
-            &lt;code&gt;ORDER BY&lt;/code&gt; lists.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+            <c>ORDER BY</c> lists.</summary>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -6367,7 +6434,8 @@
       <Parameters />
       <Docs>
         <summary>Retrieves whether this database supports the ODBC Extended SQL grammar.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -6407,7 +6475,8 @@
       <Parameters />
       <Docs>
         <summary>Retrieves whether this database supports full nested outer joins.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -6448,9 +6517,10 @@
       <Docs>
         <summary>Retrieves whether auto-generated keys can be retrieved after
             a statement has been executed</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if auto-generated keys can be retrieved
-                    after a statement has executed; &lt;code&gt;false&lt;/code&gt; otherwise
-            &lt;p&gt;If &lt;code&gt;true&lt;/code&gt; is returned, the JDBC driver must support the
+        <returns>
+          <c>true</c> if auto-generated keys can be retrieved
+                    after a statement has executed; <c>false</c> otherwise
+            &lt;p&gt;If <c>true</c> is returned, the JDBC driver must support the
             returning of auto-generated keys for at least SQL INSERT statements
             &lt;p&gt;</returns>
         <remarks>
@@ -6492,8 +6562,9 @@
       <Parameters />
       <Docs>
         <summary>Retrieves whether this database supports some form of
-            &lt;code&gt;GROUP BY&lt;/code&gt; clause.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+            <c>GROUP BY</c> clause.</summary>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -6533,10 +6604,11 @@
       <Parameters />
       <Docs>
         <summary>Retrieves whether this database supports using columns not included in
-            the &lt;code&gt;SELECT&lt;/code&gt; statement in a &lt;code&gt;GROUP BY&lt;/code&gt; clause
-            provided that all of the columns in the &lt;code&gt;SELECT&lt;/code&gt; statement
-            are included in the &lt;code&gt;GROUP BY&lt;/code&gt; clause.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+            the <c>SELECT</c> statement in a <c>GROUP BY</c> clause
+            provided that all of the columns in the <c>SELECT</c> statement
+            are included in the <c>GROUP BY</c> clause.</summary>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -6576,9 +6648,10 @@
       <Parameters />
       <Docs>
         <summary>Retrieves whether this database supports using a column that is
-            not in the &lt;code&gt;SELECT&lt;/code&gt; statement in a
-            &lt;code&gt;GROUP BY&lt;/code&gt; clause.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+            not in the <c>SELECT</c> statement in a
+            <c>GROUP BY</c> clause.</summary>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -6619,7 +6692,8 @@
       <Docs>
         <summary>Retrieves whether this database supports the SQL Integrity
             Enhancement Facility.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -6659,8 +6733,9 @@
       <Parameters />
       <Docs>
         <summary>Retrieves whether this database supports specifying a
-            &lt;code&gt;LIKE&lt;/code&gt; escape clause.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+            <c>LIKE</c> escape clause.</summary>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -6701,7 +6776,8 @@
       <Docs>
         <summary>Retrieves whether this database provides limited support for outer
             joins.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -6741,7 +6817,8 @@
       <Parameters />
       <Docs>
         <summary>Retrieves whether this database supports the ODBC Minimum SQL grammar.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -6782,7 +6859,8 @@
       <Docs>
         <summary>Retrieves whether this database treats mixed case unquoted SQL identifiers as
             case sensitive and as a result stores them in mixed case.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -6823,7 +6901,8 @@
       <Docs>
         <summary>Retrieves whether this database treats mixed case quoted SQL identifiers as
             case sensitive and as a result stores them in mixed case.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -6862,12 +6941,13 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Retrieves whether it is possible to have multiple &lt;code&gt;ResultSet&lt;/code&gt; objects
-            returned from a &lt;code&gt;CallableStatement&lt;/code&gt; object
+        <summary>Retrieves whether it is possible to have multiple <c>ResultSet</c> objects
+            returned from a <c>CallableStatement</c> object
             simultaneously.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if a &lt;code&gt;CallableStatement&lt;/code&gt; object
-                    can return multiple &lt;code&gt;ResultSet&lt;/code&gt; objects
-                    simultaneously; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if a <c>CallableStatement</c> object
+                    can return multiple <c>ResultSet</c> objects
+                    simultaneously; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -6907,9 +6987,10 @@
       <Parameters />
       <Docs>
         <summary>Retrieves whether this database supports getting multiple
-            &lt;code&gt;ResultSet&lt;/code&gt; objects from a single call to the
-            method &lt;code&gt;execute&lt;/code&gt;.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+            <c>ResultSet</c> objects from a single call to the
+            method <c>execute</c>.</summary>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -6950,7 +7031,8 @@
       <Docs>
         <summary>Retrieves whether this database allows having multiple
             transactions open at once (on different connections).</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -6991,8 +7073,9 @@
       <Docs>
         <summary>Retrieves whether this database supports named parameters to callable
             statements.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if named parameters are supported;
-                    &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if named parameters are supported;
+                    <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -7032,7 +7115,8 @@
       <Parameters />
       <Docs>
         <summary>Retrieves whether columns in this database may be defined as non-nullable.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -7073,8 +7157,9 @@
       <Docs>
         <summary>Retrieves whether this database supports keeping cursors open
             across commits.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if cursors always remain open;
-                  &lt;code&gt;false&lt;/code&gt; if they might not remain open</returns>
+        <returns>
+          <c>true</c> if cursors always remain open;
+                  <c>false</c> if they might not remain open</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -7115,8 +7200,9 @@
       <Docs>
         <summary>Retrieves whether this database supports keeping cursors open
             across rollbacks.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if cursors always remain open;
-                  &lt;code&gt;false&lt;/code&gt; if they might not remain open</returns>
+        <returns>
+          <c>true</c> if cursors always remain open;
+                  <c>false</c> if they might not remain open</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -7157,8 +7243,9 @@
       <Docs>
         <summary>Retrieves whether this database supports keeping statements open
             across commits.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if statements always remain open;
-                  &lt;code&gt;false&lt;/code&gt; if they might not remain open</returns>
+        <returns>
+          <c>true</c> if statements always remain open;
+                  <c>false</c> if they might not remain open</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -7199,8 +7286,9 @@
       <Docs>
         <summary>Retrieves whether this database supports keeping statements open
             across rollbacks.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if statements always remain open;
-                  &lt;code&gt;false&lt;/code&gt; if they might not remain open</returns>
+        <returns>
+          <c>true</c> if statements always remain open;
+                  <c>false</c> if they might not remain open</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -7240,9 +7328,10 @@
       <Parameters />
       <Docs>
         <summary>Retrieves whether this database supports using a column that is
-            not in the &lt;code&gt;SELECT&lt;/code&gt; statement in an
-            &lt;code&gt;ORDER BY&lt;/code&gt; clause.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+            not in the <c>SELECT</c> statement in an
+            <c>ORDER BY</c> clause.</summary>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -7282,7 +7371,8 @@
       <Parameters />
       <Docs>
         <summary>Retrieves whether this database supports some form of outer join.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -7321,9 +7411,10 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Retrieves whether this database supports positioned &lt;code&gt;DELETE&lt;/code&gt;
+        <summary>Retrieves whether this database supports positioned <c>DELETE</c>
             statements.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -7362,9 +7453,10 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Retrieves whether this database supports positioned &lt;code&gt;UPDATE&lt;/code&gt;
+        <summary>Retrieves whether this database supports positioned <c>UPDATE</c>
             statements.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -7406,11 +7498,12 @@
         <Parameter Name="concurrency" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="type">defined in &lt;code&gt;java.sql.ResultSet&lt;/code&gt;</param>
-        <param name="concurrency">type defined in &lt;code&gt;java.sql.ResultSet&lt;/code&gt;</param>
+        <param name="type">defined in <c>java.sql.ResultSet</c></param>
+        <param name="concurrency">type defined in <c>java.sql.ResultSet</c></param>
         <summary>Retrieves whether this database supports the given concurrency type
             in combination with the given result set type.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -7496,9 +7589,10 @@
         <Parameter Name="type" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="type">defined in &lt;code&gt;java.sql.ResultSet&lt;/code&gt;</param>
+        <param name="type">defined in <c>java.sql.ResultSet</c></param>
         <summary>Retrieves whether this database supports the given result set type.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -7538,8 +7632,9 @@
       <Parameters />
       <Docs>
         <summary>Retrieves whether this database supports savepoints.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if savepoints are supported;
-                    &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if savepoints are supported;
+                    <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -7579,7 +7674,8 @@
       <Parameters />
       <Docs>
         <summary>Retrieves whether a schema name can be used in a data manipulation statement.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -7619,7 +7715,8 @@
       <Parameters />
       <Docs>
         <summary>Retrieves whether a schema name can be used in an index definition statement.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -7659,7 +7756,8 @@
       <Parameters />
       <Docs>
         <summary>Retrieves whether a schema name can be used in a privilege definition statement.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -7699,7 +7797,8 @@
       <Parameters />
       <Docs>
         <summary>Retrieves whether a schema name can be used in a procedure call statement.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -7739,7 +7838,8 @@
       <Parameters />
       <Docs>
         <summary>Retrieves whether a schema name can be used in a table definition statement.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -7778,9 +7878,10 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Retrieves whether this database supports &lt;code&gt;SELECT FOR UPDATE&lt;/code&gt;
+        <summary>Retrieves whether this database supports <c>SELECT FOR UPDATE</c>
             statements.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -7820,7 +7921,8 @@
       <Parameters />
       <Docs>
         <summary>Retrieves whether this database supports statement pooling.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -7861,7 +7963,8 @@
       <Docs>
         <summary>Retrieves whether this database supports invoking user-defined or vendor functions
             using the stored procedure escape syntax.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -7902,7 +8005,8 @@
       <Docs>
         <summary>Retrieves whether this database supports stored procedure calls
             that use the stored procedure escape syntax.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -7943,7 +8047,8 @@
       <Docs>
         <summary>Retrieves whether this database supports subqueries in comparison
             expressions.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -7983,8 +8088,9 @@
       <Parameters />
       <Docs>
         <summary>Retrieves whether this database supports subqueries in
-            &lt;code&gt;EXISTS&lt;/code&gt; expressions.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+            <c>EXISTS</c> expressions.</summary>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -8024,8 +8130,9 @@
       <Parameters />
       <Docs>
         <summary>Retrieves whether this database supports subqueries in
-            &lt;code&gt;IN&lt;/code&gt; expressions.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+            <c>IN</c> expressions.</summary>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -8066,7 +8173,8 @@
       <Docs>
         <summary>Retrieves whether this database supports subqueries in quantified
             expressions.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -8106,7 +8214,8 @@
       <Parameters />
       <Docs>
         <summary>Retrieves whether this database supports table correlation names.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -8148,9 +8257,10 @@
       </Parameters>
       <Docs>
         <param name="level">one of the transaction isolation levels defined in
-                    &lt;code&gt;java.sql.Connection&lt;/code&gt;</param>
+                    <c>java.sql.Connection</c></param>
         <summary>Retrieves whether this database supports the given transaction isolation level.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -8190,8 +8300,9 @@
       <Parameters />
       <Docs>
         <summary>Retrieves whether this database supports transactions.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if transactions are supported;
-                    &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if transactions are supported;
+                    <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -8230,8 +8341,9 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Retrieves whether this database supports SQL &lt;code&gt;UNION&lt;/code&gt;.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <summary>Retrieves whether this database supports SQL <c>UNION</c>.</summary>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -8270,8 +8382,9 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Retrieves whether this database supports SQL &lt;code&gt;UNION ALL&lt;/code&gt;.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <summary>Retrieves whether this database supports SQL <c>UNION ALL</c>.</summary>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -8577,7 +8690,7 @@
       </ReturnValue>
       <MemberValue>0</MemberValue>
       <Docs>
-        <summary>Indicates that a &lt;code&gt;NULL&lt;/code&gt; value is NOT allowed for this
+        <summary>Indicates that a <c>NULL</c> value is NOT allowed for this
             data type.</summary>
         <remarks>
           <para>
@@ -8614,7 +8727,7 @@
       </ReturnValue>
       <MemberValue>1</MemberValue>
       <Docs>
-        <summary>Indicates that a &lt;code&gt;NULL&lt;/code&gt; value is allowed for this
+        <summary>Indicates that a <c>NULL</c> value is allowed for this
             data type.</summary>
         <remarks>
           <para>
@@ -8651,7 +8764,7 @@
       </ReturnValue>
       <MemberValue>2</MemberValue>
       <Docs>
-        <summary>Indicates that it is not known whether a &lt;code&gt;NULL&lt;/code&gt; value
+        <summary>Indicates that it is not known whether a <c>NULL</c> value
             is allowed for this data type.</summary>
         <remarks>
           <para>
@@ -8688,9 +8801,9 @@
       </ReturnValue>
       <MemberValue>2</MemberValue>
       <Docs>
-        <summary>Indicates that the data type can be only be used in &lt;code&gt;WHERE&lt;/code&gt;
+        <summary>Indicates that the data type can be only be used in <c>WHERE</c>
             search clauses
-            that do not use &lt;code&gt;LIKE&lt;/code&gt; predicates.</summary>
+            that do not use <c>LIKE</c> predicates.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -8727,8 +8840,8 @@
       <MemberValue>1</MemberValue>
       <Docs>
         <summary>Indicates that the data type
-            can be only be used in &lt;code&gt;WHERE&lt;/code&gt; search clauses
-            that  use &lt;code&gt;LIKE&lt;/code&gt; predicates.</summary>
+            can be only be used in <c>WHERE</c> search clauses
+            that  use <c>LIKE</c> predicates.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -8764,7 +8877,7 @@
       </ReturnValue>
       <MemberValue>0</MemberValue>
       <Docs>
-        <summary>Indicates that &lt;code&gt;WHERE&lt;/code&gt; search clauses are not supported
+        <summary>Indicates that <c>WHERE</c> search clauses are not supported
             for this type.</summary>
         <remarks>
           <para>
@@ -8801,7 +8914,7 @@
       </ReturnValue>
       <MemberValue>3</MemberValue>
       <Docs>
-        <summary>Indicates that all &lt;code&gt;WHERE&lt;/code&gt; search clauses can be
+        <summary>Indicates that all <c>WHERE</c> search clauses can be
             based on this type.</summary>
         <remarks>
           <para>
@@ -8840,14 +8953,15 @@
         <Parameter Name="type" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="type">the &lt;code&gt;ResultSet&lt;/code&gt; type; one of
-                   &lt;code&gt;ResultSet.TYPE_FORWARD_ONLY&lt;/code&gt;,
-                   &lt;code&gt;ResultSet.TYPE_SCROLL_INSENSITIVE&lt;/code&gt;, or
-                   &lt;code&gt;ResultSet.TYPE_SCROLL_SENSITIVE&lt;/code&gt;</param>
+        <param name="type">the <c>ResultSet</c> type; one of
+                   <c>ResultSet.TYPE_FORWARD_ONLY</c>,
+                   <c>ResultSet.TYPE_SCROLL_INSENSITIVE</c>, or
+                   <c>ResultSet.TYPE_SCROLL_SENSITIVE</c></param>
         <summary>Retrieves whether or not a visible row update can be detected by
-            calling the method &lt;code&gt;ResultSet.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if changes are detected by the result set type;
-                    &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+            calling the method <c>ResultSet.rowUpdated</c>.</summary>
+        <returns>
+          <c>true</c> if changes are detected by the result set type;
+                    <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -8947,8 +9061,9 @@
       <Parameters />
       <Docs>
         <summary>Retrieves whether this database uses a file for each table.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if this database uses a local file for each table;
-                    &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if this database uses a local file for each table;
+                    <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -8988,7 +9103,8 @@
       <Parameters />
       <Docs>
         <summary>Retrieves whether this database stores tables in a local file.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.Sql/IDriver.xml b/docs/Mono.Android/en/Java.Sql/IDriver.xml
index 3765fc2449..6a97015c4c 100644
--- a/docs/Mono.Android/en/Java.Sql/IDriver.xml
+++ b/docs/Mono.Android/en/Java.Sql/IDriver.xml
@@ -67,8 +67,9 @@
         <param name="url">the URL of the database</param>
         <summary>Retrieves whether the driver thinks that it can open a connection
             to the given URL.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if this driver understands the given URL;
-                    &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if this driver understands the given URL;
+                    <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -115,7 +116,7 @@
             connection arguments. Normally at least a "user" and
             "password" property should be included.</param>
         <summary>Attempts to make a database connection to the given URL.</summary>
-        <returns>a &lt;code&gt;Connection&lt;/code&gt; object that represents a
+        <returns>a <c>Connection</c> object that represents a
                     connection to the URL</returns>
         <remarks>
           <para>
@@ -162,7 +163,7 @@
         <param name="info">a proposed list of tag/value pairs that will be sent on
                      connect open</param>
         <summary>Gets information about the possible properties for this driver.</summary>
-        <returns>an array of &lt;code&gt;DriverPropertyInfo&lt;/code&gt; objects describing
+        <returns>an array of <c>DriverPropertyInfo</c> objects describing
                      possible properties.  This array may be an empty array if
                      no properties are required.</returns>
         <remarks>
@@ -205,7 +206,8 @@
       <Docs>
         <summary>Reports whether this driver is a genuine JDBC
             Compliant&lt;sup&gt;&lt;font size=-2&gt;TM&lt;/font&gt;&lt;/sup&gt; driver.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if this driver is JDBC Compliant; &lt;code&gt;false&lt;/code&gt;
+        <returns>
+          <c>true</c> if this driver is JDBC Compliant; <c>false</c>
                     otherwise</returns>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.Sql/INClob.xml b/docs/Mono.Android/en/Java.Sql/INClob.xml
index a99f6ab7e2..111c3c3697 100644
--- a/docs/Mono.Android/en/Java.Sql/INClob.xml
+++ b/docs/Mono.Android/en/Java.Sql/INClob.xml
@@ -29,7 +29,7 @@
   </Attributes>
   <Docs since="9">
     <summary>The mapping in the Java&lt;sup&gt;&lt;font size=-2&gt;TM&lt;/font&gt;&lt;/sup&gt; programming language
-            for the SQL &lt;code&gt;NCLOB&lt;/code&gt; type.</summary>
+            for the SQL <c>NCLOB</c> type.</summary>
     <remarks>
       <para>
         <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.Sql/IParameterMetaData.xml b/docs/Mono.Android/en/Java.Sql/IParameterMetaData.xml
index e50900cc26..7103a5f04f 100644
--- a/docs/Mono.Android/en/Java.Sql/IParameterMetaData.xml
+++ b/docs/Mono.Android/en/Java.Sql/IParameterMetaData.xml
@@ -30,7 +30,7 @@
   <Docs since="1">
     <summary>An object that can be used to get information about the types
             and properties for each parameter marker in a
-            &lt;code&gt;PreparedStatement&lt;/code&gt; object.</summary>
+            <c>PreparedStatement</c> object.</summary>
     <remarks>
       <para>
         <format type="text/html">
@@ -71,10 +71,10 @@
       <Docs>
         <param name="param">the first parameter is 1, the second is 2, ...</param>
         <summary>Retrieves the fully-qualified name of the Java class whose instances
-            should be passed to the method &lt;code&gt;PreparedStatement.</summary>
+            should be passed to the method <c>PreparedStatement.setObject</c>.</summary>
         <returns>the fully-qualified name of the class in the Java programming
                     language that would be used by the method
-                    &lt;code&gt;PreparedStatement.setObject&lt;/code&gt; to set the value
+                    <c>PreparedStatement.setObject</c> to set the value
                     in the specified parameter. This is the class name used
                     for custom mapping.</returns>
         <remarks>
@@ -120,10 +120,9 @@
         <param name="param">the first parameter is 1, the second is 2, ...</param>
         <summary>Retrieves the designated parameter's mode.</summary>
         <returns>mode of the parameter; one of
-                   &lt;code&gt;ParameterMetaData.parameterModeIn&lt;/code&gt;,
-                   &lt;code&gt;ParameterMetaData.parameterModeOut&lt;/code&gt;, or
-                   &lt;code&gt;ParameterMetaData.parameterModeInOut&lt;/code&gt;
-                   &lt;code&gt;ParameterMetaData.parameterModeUnknown&lt;/code&gt;.</returns>
+                   <c>ParameterMetaData.parameterModeIn</c>,
+                   <c>ParameterMetaData.parameterModeOut</c>, or
+                   <c>ParameterMetaData.parameterModeInOut</c><c>ParameterMetaData.parameterModeUnknown</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -166,7 +165,7 @@
       <Docs>
         <param name="param">the first parameter is 1, the second is 2, ...</param>
         <summary>Retrieves the designated parameter's SQL type.</summary>
-        <returns>SQL type from &lt;code&gt;java.sql.Types&lt;/code&gt;</returns>
+        <returns>SQL type from <c>java.sql.Types</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -340,9 +339,9 @@
         <param name="param">the first parameter is 1, the second is 2, ...</param>
         <summary>Retrieves whether null values are allowed in the designated parameter.</summary>
         <returns>the nullability status of the given parameter; one of
-                   &lt;code&gt;ParameterMetaData.parameterNoNulls&lt;/code&gt;,
-                   &lt;code&gt;ParameterMetaData.parameterNullable&lt;/code&gt;, or
-                   &lt;code&gt;ParameterMetaData.parameterNullableUnknown&lt;/code&gt;</returns>
+                   <c>ParameterMetaData.parameterNoNulls</c>,
+                   <c>ParameterMetaData.parameterNullable</c>, or
+                   <c>ParameterMetaData.parameterNullableUnknown</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -385,7 +384,8 @@
       <Docs>
         <param name="param">the first parameter is 1, the second is 2, ...</param>
         <summary>Retrieves whether values for the designated parameter can be signed numbers.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -600,7 +600,7 @@
       <MemberValue>0</MemberValue>
       <Docs>
         <summary>The constant indicating that a
-            parameter will not allow &lt;code&gt;NULL&lt;/code&gt; values.</summary>
+            parameter will not allow <c>NULL</c> values.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -637,7 +637,7 @@
       <MemberValue>1</MemberValue>
       <Docs>
         <summary>The constant indicating that a
-            parameter will allow &lt;code&gt;NULL&lt;/code&gt; values.</summary>
+            parameter will allow <c>NULL</c> values.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.Sql/IPreparedStatement.xml b/docs/Mono.Android/en/Java.Sql/IPreparedStatement.xml
index e601d17e7b..b0527d7992 100644
--- a/docs/Mono.Android/en/Java.Sql/IPreparedStatement.xml
+++ b/docs/Mono.Android/en/Java.Sql/IPreparedStatement.xml
@@ -68,7 +68,7 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Adds a set of parameters to this &lt;code&gt;PreparedStatement&lt;/code&gt;
+        <summary>Adds a set of parameters to this <c>PreparedStatement</c>
             object's batch of commands.</summary>
         <remarks>
           <para>
@@ -147,10 +147,11 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Executes the SQL statement in this &lt;code&gt;PreparedStatement&lt;/code&gt; object,
+        <summary>Executes the SQL statement in this <c>PreparedStatement</c> object,
             which may be any kind of SQL statement.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if the first result is a &lt;code&gt;ResultSet&lt;/code&gt;
-                    object; &lt;code&gt;false&lt;/code&gt; if the first result is an update
+        <returns>
+          <c>true</c> if the first result is a <c>ResultSet</c>
+                    object; <c>false</c> if the first result is an update
                     count or there is no result</returns>
         <remarks>
           <para>
@@ -190,10 +191,10 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Executes the SQL query in this &lt;code&gt;PreparedStatement&lt;/code&gt; object
-            and returns the &lt;code&gt;ResultSet&lt;/code&gt; object generated by the query.</summary>
-        <returns>a &lt;code&gt;ResultSet&lt;/code&gt; object that contains the data produced by the
-                    query; never &lt;code&gt;null&lt;/code&gt;</returns>
+        <summary>Executes the SQL query in this <c>PreparedStatement</c> object
+            and returns the <c>ResultSet</c> object generated by the query.</summary>
+        <returns>a <c>ResultSet</c> object that contains the data produced by the
+                    query; never <c>null</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -233,9 +234,9 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Executes the SQL statement in this &lt;code&gt;PreparedStatement&lt;/code&gt; object,
-            which must be an SQL Data Manipulation Language (DML) statement, such as &lt;code&gt;INSERT&lt;/code&gt;, &lt;code&gt;UPDATE&lt;/code&gt; or
-            &lt;code&gt;DELETE&lt;/code&gt;; or an SQL statement that returns nothing,
+        <summary>Executes the SQL statement in this <c>PreparedStatement</c> object,
+            which must be an SQL Data Manipulation Language (DML) statement, such as <c>INSERT</c>, <c>UPDATE</c> or
+            <c>DELETE</c>; or an SQL statement that returns nothing,
             such as a DDL statement.</summary>
         <returns>either (1) the row count for SQL Data Manipulation Language (DML) statements
                     or (2) 0 for SQL statements that return nothing</returns>
@@ -342,8 +343,8 @@
       </Parameters>
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
-        <param name="x">an &lt;code&gt;Array&lt;/code&gt; object that maps an SQL &lt;code&gt;ARRAY&lt;/code&gt; value</param>
-        <summary>Sets the designated parameter to the given &lt;code&gt;java.</summary>
+        <param name="x">an <c>Array</c> object that maps an SQL <c>ARRAY</c> value</param>
+        <summary>Sets the designated parameter to the given <c>java.sql.Array</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -525,7 +526,7 @@
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
         <param name="x">the parameter value</param>
-        <summary>Sets the designated parameter to the given &lt;code&gt;java.</summary>
+        <summary>Sets the designated parameter to the given <c>java.math.BigDecimal</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -706,8 +707,8 @@
       </Parameters>
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
-        <param name="x">a &lt;code&gt;Blob&lt;/code&gt; object that maps an SQL &lt;code&gt;BLOB&lt;/code&gt; value</param>
-        <summary>Sets the designated parameter to the given &lt;code&gt;java.</summary>
+        <param name="x">a <c>Blob</c> object that maps an SQL <c>BLOB</c> value</param>
+        <summary>Sets the designated parameter to the given <c>java.sql.Blob</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -753,7 +754,7 @@
             the second is 2, ...</param>
         <param name="inputStream">An object that contains the data to set the parameter
             value to.</param>
-        <summary>Sets the designated parameter to a &lt;code&gt;InputStream&lt;/code&gt; object.</summary>
+        <summary>Sets the designated parameter to a <c>InputStream</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -801,7 +802,7 @@
         <param name="inputStream">An object that contains the data to set the parameter
             value to.</param>
         <param name="length">the number of bytes in the parameter data.</param>
-        <summary>Sets the designated parameter to a &lt;code&gt;InputStream&lt;/code&gt; object.</summary>
+        <summary>Sets the designated parameter to a <c>InputStream</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -845,7 +846,7 @@
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
         <param name="x">the parameter value</param>
-        <summary>Sets the designated parameter to the given Java &lt;code&gt;boolean&lt;/code&gt; value.</summary>
+        <summary>Sets the designated parameter to the given Java <c>boolean</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -889,7 +890,7 @@
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
         <param name="x">the parameter value</param>
-        <summary>Sets the designated parameter to the given Java &lt;code&gt;byte&lt;/code&gt; value.</summary>
+        <summary>Sets the designated parameter to the given Java <c>byte</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -976,9 +977,9 @@
       </Parameters>
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
-        <param name="reader">the &lt;code&gt;java.io.Reader&lt;/code&gt; object that contains the
+        <param name="reader">the <c>java.io.Reader</c> object that contains the
                    Unicode data</param>
-        <summary>Sets the designated parameter to the given &lt;code&gt;Reader&lt;/code&gt;
+        <summary>Sets the designated parameter to the given <c>Reader</c>
             object.</summary>
         <remarks>
           <para>
@@ -1023,10 +1024,10 @@
       </Parameters>
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
-        <param name="reader">the &lt;code&gt;java.io.Reader&lt;/code&gt; object that contains the
+        <param name="reader">the <c>java.io.Reader</c> object that contains the
                    Unicode data</param>
         <param name="length">the number of characters in the stream</param>
-        <summary>Sets the designated parameter to the given &lt;code&gt;Reader&lt;/code&gt;
+        <summary>Sets the designated parameter to the given <c>Reader</c>
             object, which is the given number of characters long.</summary>
         <remarks>
           <para>
@@ -1071,10 +1072,10 @@
       </Parameters>
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
-        <param name="reader">the &lt;code&gt;java.io.Reader&lt;/code&gt; object that contains the
+        <param name="reader">the <c>java.io.Reader</c> object that contains the
                    Unicode data</param>
         <param name="length">the number of characters in the stream</param>
-        <summary>Sets the designated parameter to the given &lt;code&gt;Reader&lt;/code&gt;
+        <summary>Sets the designated parameter to the given <c>Reader</c>
             object, which is the given number of characters long.</summary>
         <remarks>
           <para>
@@ -1119,7 +1120,7 @@
       <Docs>
         <param name="parameterIndex">index of the first parameter is 1, the second is 2, ...</param>
         <param name="reader">An object that contains the data to set the parameter value to.</param>
-        <summary>Sets the designated parameter to a &lt;code&gt;Reader&lt;/code&gt; object.</summary>
+        <summary>Sets the designated parameter to a <c>Reader</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -1162,8 +1163,8 @@
       </Parameters>
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
-        <param name="x">a &lt;code&gt;Clob&lt;/code&gt; object that maps an SQL &lt;code&gt;CLOB&lt;/code&gt; value</param>
-        <summary>Sets the designated parameter to the given &lt;code&gt;java.</summary>
+        <param name="x">a <c>Clob</c> object that maps an SQL <c>CLOB</c> value</param>
+        <summary>Sets the designated parameter to the given <c>java.sql.Clob</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -1209,7 +1210,7 @@
         <param name="parameterIndex">index of the first parameter is 1, the second is 2, ...</param>
         <param name="reader">An object that contains the data to set the parameter value to.</param>
         <param name="length">the number of characters in the parameter data.</param>
-        <summary>Sets the designated parameter to a &lt;code&gt;Reader&lt;/code&gt; object.</summary>
+        <summary>Sets the designated parameter to a <c>Reader</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -1253,7 +1254,9 @@
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
         <param name="x">the parameter value</param>
-        <summary>Sets the designated parameter to the given &lt;code&gt;java.</summary>
+        <summary>Sets the designated parameter to the given <c>java.sql.Date</c> value
+            using the default time zone of the virtual machine that is running
+            the application.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -1298,9 +1301,10 @@
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
         <param name="x">the parameter value</param>
-        <param name="cal">the &lt;code&gt;Calendar&lt;/code&gt; object the driver will use
+        <param name="cal">the <c>Calendar</c> object the driver will use
                        to construct the date</param>
-        <summary>Sets the designated parameter to the given &lt;code&gt;java.</summary>
+        <summary>Sets the designated parameter to the given <c>java.sql.Date</c> value,
+            using the given <c>Calendar</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -1345,7 +1349,7 @@
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
         <param name="x">the parameter value</param>
-        <summary>Sets the designated parameter to the given Java &lt;code&gt;double&lt;/code&gt; value.</summary>
+        <summary>Sets the designated parameter to the given Java <c>double</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -1389,7 +1393,7 @@
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
         <param name="x">the parameter value</param>
-        <summary>Sets the designated parameter to the given Java &lt;code&gt;float&lt;/code&gt; value.</summary>
+        <summary>Sets the designated parameter to the given Java <c>float</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -1433,7 +1437,7 @@
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
         <param name="x">the parameter value</param>
-        <summary>Sets the designated parameter to the given Java &lt;code&gt;int&lt;/code&gt; value.</summary>
+        <summary>Sets the designated parameter to the given Java <c>int</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -1477,7 +1481,7 @@
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
         <param name="x">the parameter value</param>
-        <summary>Sets the designated parameter to the given Java &lt;code&gt;long&lt;/code&gt; value.</summary>
+        <summary>Sets the designated parameter to the given Java <c>long</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -1521,7 +1525,7 @@
       <Docs>
         <param name="parameterIndex">of the first parameter is 1, the second is 2, ...</param>
         <param name="value">the parameter value</param>
-        <summary>Sets the designated parameter to a &lt;code&gt;Reader&lt;/code&gt; object.</summary>
+        <summary>Sets the designated parameter to a <c>Reader</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -1567,7 +1571,7 @@
         <param name="parameterIndex">of the first parameter is 1, the second is 2, ...</param>
         <param name="value">the parameter value</param>
         <param name="length">the number of characters in the parameter data.</param>
-        <summary>Sets the designated parameter to a &lt;code&gt;Reader&lt;/code&gt; object.</summary>
+        <summary>Sets the designated parameter to a <c>Reader</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -1611,7 +1615,7 @@
       <Docs>
         <param name="parameterIndex">index of the first parameter is 1, the second is 2, ...</param>
         <param name="reader">An object that contains the data to set the parameter value to.</param>
-        <summary>Sets the designated parameter to a &lt;code&gt;Reader&lt;/code&gt; object.</summary>
+        <summary>Sets the designated parameter to a <c>Reader</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -1655,7 +1659,7 @@
       <Docs>
         <param name="parameterIndex">of the first parameter is 1, the second is 2, ...</param>
         <param name="value">the parameter value</param>
-        <summary>Sets the designated parameter to a &lt;code&gt;java.</summary>
+        <summary>Sets the designated parameter to a <c>java.sql.NClob</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -1701,7 +1705,7 @@
         <param name="parameterIndex">index of the first parameter is 1, the second is 2, ...</param>
         <param name="reader">An object that contains the data to set the parameter value to.</param>
         <param name="length">the number of characters in the parameter data.</param>
-        <summary>Sets the designated parameter to a &lt;code&gt;Reader&lt;/code&gt; object.</summary>
+        <summary>Sets the designated parameter to a <c>Reader</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -1745,7 +1749,7 @@
       <Docs>
         <param name="parameterIndex">of the first parameter is 1, the second is 2, ...</param>
         <param name="value">the parameter value</param>
-        <summary>Sets the designated paramter to the given &lt;code&gt;String&lt;/code&gt; object.</summary>
+        <summary>Sets the designated paramter to the given <c>String</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -1788,8 +1792,8 @@
       </Parameters>
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
-        <param name="sqlType">the SQL type code defined in &lt;code&gt;java.sql.Types&lt;/code&gt;</param>
-        <summary>Sets the designated parameter to SQL &lt;code&gt;NULL&lt;/code&gt;.</summary>
+        <param name="sqlType">the SQL type code defined in <c>java.sql.Types</c></param>
+        <summary>Sets the designated parameter to SQL <c>NULL</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -1833,10 +1837,10 @@
       </Parameters>
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
-        <param name="sqlType">a value from &lt;code&gt;java.sql.Types&lt;/code&gt;</param>
+        <param name="sqlType">a value from <c>java.sql.Types</c></param>
         <param name="typeName">the fully-qualified name of an SQL user-defined type;
              ignored if the parameter is not a user-defined type or REF</param>
-        <summary>Sets the designated parameter to SQL &lt;code&gt;NULL&lt;/code&gt;.</summary>
+        <summary>Sets the designated parameter to SQL <c>NULL</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -1975,10 +1979,10 @@
         <param name="x">the object containing the input parameter value</param>
         <param name="targetSqlType">the SQL type (as defined in java.sql.Types) to be
             sent to the database. The scale argument may further qualify this type.</param>
-        <param name="scaleOrLength">for &lt;code&gt;java.sql.Types.DECIMAL&lt;/code&gt;
-                     or &lt;code&gt;java.sql.Types.NUMERIC types&lt;/code&gt;,
+        <param name="scaleOrLength">for <c>java.sql.Types.DECIMAL</c>
+                     or <c>java.sql.Types.NUMERIC types</c>,
                      this is the number of digits after the decimal point. For
-                     Java Object types &lt;code&gt;InputStream&lt;/code&gt; and &lt;code&gt;Reader&lt;/code&gt;,
+                     Java Object types <c>InputStream</c> and <c>Reader</c>,
                      this is the length
                      of the data in the stream or reader.  For all other types,
                      this value will be ignored.</param>
@@ -2025,9 +2029,9 @@
       </Parameters>
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
-        <param name="x">an SQL &lt;code&gt;REF&lt;/code&gt; value</param>
+        <param name="x">an SQL <c>REF</c> value</param>
         <summary>Sets the designated parameter to the given
-             &lt;code&gt;REF(&amp;lt;structured-type&amp;gt;)&lt;/code&gt; value.</summary>
+             <c>REF(&amp;lt;structured-type&amp;gt;)</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -2071,7 +2075,7 @@
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
         <param name="x">the parameter value</param>
-        <summary>Sets the designated parameter to the given &lt;code&gt;java.</summary>
+        <summary>Sets the designated parameter to the given <c>java.sql.RowId</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -2115,7 +2119,7 @@
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
         <param name="x">the parameter value</param>
-        <summary>Sets the designated parameter to the given Java &lt;code&gt;short&lt;/code&gt; value.</summary>
+        <summary>Sets the designated parameter to the given Java <c>short</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -2158,8 +2162,8 @@
       </Parameters>
       <Docs>
         <param name="parameterIndex">index of the first parameter is 1, the second is 2, ...</param>
-        <param name="xmlObject">a &lt;code&gt;SQLXML&lt;/code&gt; object that maps an SQL &lt;code&gt;XML&lt;/code&gt; value</param>
-        <summary>Sets the designated parameter to the given &lt;code&gt;java.</summary>
+        <param name="xmlObject">a <c>SQLXML</c> object that maps an SQL <c>XML</c> value</param>
+        <summary>Sets the designated parameter to the given <c>java.sql.SQLXML</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -2203,7 +2207,7 @@
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
         <param name="x">the parameter value</param>
-        <summary>Sets the designated parameter to the given Java &lt;code&gt;String&lt;/code&gt; value.</summary>
+        <summary>Sets the designated parameter to the given Java <c>String</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -2247,7 +2251,7 @@
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
         <param name="x">the parameter value</param>
-        <summary>Sets the designated parameter to the given &lt;code&gt;java.</summary>
+        <summary>Sets the designated parameter to the given <c>java.sql.Time</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -2292,9 +2296,10 @@
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
         <param name="x">the parameter value</param>
-        <param name="cal">the &lt;code&gt;Calendar&lt;/code&gt; object the driver will use
+        <param name="cal">the <c>Calendar</c> object the driver will use
                        to construct the time</param>
-        <summary>Sets the designated parameter to the given &lt;code&gt;java.</summary>
+        <summary>Sets the designated parameter to the given <c>java.sql.Time</c> value,
+            using the given <c>Calendar</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -2339,7 +2344,7 @@
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
         <param name="x">the parameter value</param>
-        <summary>Sets the designated parameter to the given &lt;code&gt;java.</summary>
+        <summary>Sets the designated parameter to the given <c>java.sql.Timestamp</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -2384,9 +2389,10 @@
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
         <param name="x">the parameter value</param>
-        <param name="cal">the &lt;code&gt;Calendar&lt;/code&gt; object the driver will use
+        <param name="cal">the <c>Calendar</c> object the driver will use
                        to construct the timestamp</param>
-        <summary>Sets the designated parameter to the given &lt;code&gt;java.</summary>
+        <summary>Sets the designated parameter to the given <c>java.sql.Timestamp</c> value,
+            using the given <c>Calendar</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -2435,7 +2441,7 @@
       </Parameters>
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
-        <param name="x">a &lt;code&gt;java.io.InputStream&lt;/code&gt; object that contains the
+        <param name="x">a <c>java.io.InputStream</c> object that contains the
                    Unicode parameter value</param>
         <param name="length">the number of bytes in the stream</param>
         <summary>Sets the designated parameter to the given input stream, which
@@ -2482,8 +2488,8 @@
       </Parameters>
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
-        <param name="x">the &lt;code&gt;java.net.URL&lt;/code&gt; object to be set</param>
-        <summary>Sets the designated parameter to the given &lt;code&gt;java.</summary>
+        <param name="x">the <c>java.net.URL</c> object to be set</param>
+        <summary>Sets the designated parameter to the given <c>java.net.URL</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.Sql/IRef.xml b/docs/Mono.Android/en/Java.Sql/IRef.xml
index d77d52accf..14f4033443 100644
--- a/docs/Mono.Android/en/Java.Sql/IRef.xml
+++ b/docs/Mono.Android/en/Java.Sql/IRef.xml
@@ -25,7 +25,7 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>The mapping in the Java programming language of an SQL &lt;code&gt;REF&lt;/code&gt;
+    <summary>The mapping in the Java programming language of an SQL <c>REF</c>
             value, which is a reference to an SQL structured type value in the database.</summary>
     <remarks>
       <para>
@@ -96,15 +96,15 @@
         <Parameter Name="map" Type="System.Collections.Generic.IDictionary&lt;System.String,Java.Lang.Class&gt;" />
       </Parameters>
       <Docs>
-        <param name="map">a &lt;code&gt;java.util.Map&lt;/code&gt; object that contains
+        <param name="map">a <c>java.util.Map</c> object that contains
                    the mapping to use (the fully-qualified name of the SQL
                    structured type being referenced and the class object for
-                   &lt;code&gt;SQLData&lt;/code&gt; implementation to which the SQL
+                   <c>SQLData</c> implementation to which the SQL
                    structured type will be mapped)</param>
         <summary>Retrieves the referenced object and maps it to a Java type
             using the given type map.</summary>
-        <returns>a Java &lt;code&gt;Object&lt;/code&gt; that is the custom mapping for
-                     the SQL structured type to which this &lt;code&gt;Ref&lt;/code&gt;
+        <returns>a Java <c>Object</c> that is the custom mapping for
+                     the SQL structured type to which this <c>Ref</c>
                      object refers</returns>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.Sql/IResultSet.xml b/docs/Mono.Android/en/Java.Sql/IResultSet.xml
index 1844b5de58..2415a9c1d1 100644
--- a/docs/Mono.Android/en/Java.Sql/IResultSet.xml
+++ b/docs/Mono.Android/en/Java.Sql/IResultSet.xml
@@ -74,10 +74,11 @@
                    counting from the beginning of the result set; a negative number
                    indicates the row number counting from the end of the result set</param>
         <summary>Moves the cursor to the given row number in
-            this &lt;code&gt;ResultSet&lt;/code&gt; object.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if the cursor is moved to a position in this
-            &lt;code&gt;ResultSet&lt;/code&gt; object;
-            &lt;code&gt;false&lt;/code&gt; if the cursor is before the first row or after the
+            this <c>ResultSet</c> object.</summary>
+        <returns>
+          <c>true</c> if the cursor is moved to a position in this
+            <c>ResultSet</c> object;
+            <c>false</c> if the cursor is before the first row or after the
             last row</returns>
         <remarks>
           <para>
@@ -118,7 +119,7 @@
       <Parameters />
       <Docs>
         <summary>Moves the cursor to the end of
-            this &lt;code&gt;ResultSet&lt;/code&gt; object, just after the
+            this <c>ResultSet</c> object, just after the
             last row.</summary>
         <remarks>
           <para>
@@ -159,7 +160,7 @@
       <Parameters />
       <Docs>
         <summary>Moves the cursor to the front of
-            this &lt;code&gt;ResultSet&lt;/code&gt; object, just before the
+            this <c>ResultSet</c> object, just before the
             first row.</summary>
         <remarks>
           <para>
@@ -200,7 +201,7 @@
       <Parameters />
       <Docs>
         <summary>Cancels the updates made to the current row in this
-            &lt;code&gt;ResultSet&lt;/code&gt; object.</summary>
+            <c>ResultSet</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -239,7 +240,7 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Clears all warnings reported on this &lt;code&gt;ResultSet&lt;/code&gt; object.</summary>
+        <summary>Clears all warnings reported on this <c>ResultSet</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -278,7 +279,7 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Releases this &lt;code&gt;ResultSet&lt;/code&gt; object's database and
+        <summary>Releases this <c>ResultSet</c> object's database and
             JDBC resources immediately instead of waiting for
             this to happen when it is automatically closed.</summary>
         <remarks>
@@ -319,7 +320,7 @@
       </ReturnValue>
       <MemberValue>2</MemberValue>
       <Docs>
-        <summary>The constant indicating that open &lt;code&gt;ResultSet&lt;/code&gt; objects with this
+        <summary>The constant indicating that open <c>ResultSet</c> objects with this
             holdability will be closed when the current transaction is commited.</summary>
         <remarks>
           <para>
@@ -357,7 +358,7 @@
       <MemberValue>1007</MemberValue>
       <Docs>
         <summary>The constant indicating the concurrency mode for a
-            &lt;code&gt;ResultSet&lt;/code&gt; object that may NOT be updated.</summary>
+            <c>ResultSet</c> object that may NOT be updated.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -424,7 +425,7 @@
       <MemberValue>1008</MemberValue>
       <Docs>
         <summary>The constant indicating the concurrency mode for a
-            &lt;code&gt;ResultSet&lt;/code&gt; object that may be updated.</summary>
+            <c>ResultSet</c> object that may be updated.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -490,7 +491,7 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Deletes the current row from this &lt;code&gt;ResultSet&lt;/code&gt; object
+        <summary>Deletes the current row from this <c>ResultSet</c> object
             and from the underlying database.</summary>
         <remarks>
           <para>
@@ -717,8 +718,8 @@
       </Parameters>
       <Docs>
         <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
-        <summary>Maps the given &lt;code&gt;ResultSet&lt;/code&gt; column label to its
-            &lt;code&gt;ResultSet&lt;/code&gt; column index.</summary>
+        <summary>Maps the given <c>ResultSet</c> column label to its
+            <c>ResultSet</c> column index.</summary>
         <returns>the column index of the given column name</returns>
         <remarks>
           <para>
@@ -759,9 +760,10 @@
       <Parameters />
       <Docs>
         <summary>Moves the cursor to the first row in
-            this &lt;code&gt;ResultSet&lt;/code&gt; object.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if the cursor is on a valid row;
-            &lt;code&gt;false&lt;/code&gt; if there are no rows in the result set</returns>
+            this <c>ResultSet</c> object.</summary>
+        <returns>
+          <c>true</c> if the cursor is on a valid row;
+            <c>false</c> if there are no rows in the result set</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -804,10 +806,10 @@
       <Docs>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
         <summary>Retrieves the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as an &lt;code&gt;Array&lt;/code&gt; object
+            of this <c>ResultSet</c> object as an <c>Array</c> object
             in the Java programming language.</summary>
-        <returns>an &lt;code&gt;Array&lt;/code&gt; object representing the SQL
-                    &lt;code&gt;ARRAY&lt;/code&gt; value in the specified column</returns>
+        <returns>an <c>Array</c> object representing the SQL
+                    <c>ARRAY</c> value in the specified column</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -850,9 +852,9 @@
       <Docs>
         <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <summary>Retrieves the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as an &lt;code&gt;Array&lt;/code&gt; object
+            of this <c>ResultSet</c> object as an <c>Array</c> object
             in the Java programming language.</summary>
-        <returns>an &lt;code&gt;Array&lt;/code&gt; object representing the SQL &lt;code&gt;ARRAY&lt;/code&gt; value in
+        <returns>an <c>Array</c> object representing the SQL <c>ARRAY</c> value in
                     the specified column</returns>
         <remarks>
           <para>
@@ -896,12 +898,12 @@
       <Docs>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
         <summary>Retrieves the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as
+            of this <c>ResultSet</c> object as
             a stream of ASCII characters.</summary>
         <returns>a Java input stream that delivers the database column value
             as a stream of one-byte ASCII characters;
-            if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the
-            value returned is &lt;code&gt;null&lt;/code&gt;</returns>
+            if the value is SQL <c>NULL</c>, the
+            value returned is <c>null</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -944,12 +946,12 @@
       <Docs>
         <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <summary>Retrieves the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as a stream of
+            of this <c>ResultSet</c> object as a stream of
             ASCII characters.</summary>
         <returns>a Java input stream that delivers the database column value
             as a stream of one-byte ASCII characters.
-            If the value is SQL &lt;code&gt;NULL&lt;/code&gt;,
-            the value returned is &lt;code&gt;null&lt;/code&gt;.</returns>
+            If the value is SQL <c>NULL</c>,
+            the value returned is <c>null</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -992,11 +994,11 @@
       <Docs>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
         <summary>Retrieves the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as a
-            &lt;code&gt;java.</summary>
+            of this <c>ResultSet</c> object as a
+            <c>java.math.BigDecimal</c> with full precision.</summary>
         <returns>the column value (full precision);
-            if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the value returned is
-            &lt;code&gt;null&lt;/code&gt; in the Java programming language.</returns>
+            if the value is SQL <c>NULL</c>, the value returned is
+            <c>null</c> in the Java programming language.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1039,11 +1041,11 @@
       <Docs>
         <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <summary>Retrieves the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as a
-            &lt;code&gt;java.</summary>
+            of this <c>ResultSet</c> object as a
+            <c>java.math.BigDecimal</c> with full precision.</summary>
         <returns>the column value (full precision);
-            if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the value returned is
-            &lt;code&gt;null&lt;/code&gt; in the Java programming language.</returns>
+            if the value is SQL <c>NULL</c>, the value returned is
+            <c>null</c> in the Java programming language.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1092,10 +1094,10 @@
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
         <param name="scale">the number of digits to the right of the decimal point</param>
         <summary>Retrieves the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as
-            a &lt;code&gt;java.</summary>
-        <returns>the column value; if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the
-            value returned is &lt;code&gt;null&lt;/code&gt;</returns>
+            of this <c>ResultSet</c> object as
+            a <c>java.sql.BigDecimal</c> in the Java programming language.</summary>
+        <returns>the column value; if the value is SQL <c>NULL</c>, the
+            value returned is <c>null</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1144,10 +1146,10 @@
         <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <param name="scale">the number of digits to the right of the decimal point</param>
         <summary>Retrieves the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as
-            a &lt;code&gt;java.</summary>
-        <returns>the column value; if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the
-            value returned is &lt;code&gt;null&lt;/code&gt;</returns>
+            of this <c>ResultSet</c> object as
+            a <c>java.math.BigDecimal</c> in the Java programming language.</summary>
+        <returns>the column value; if the value is SQL <c>NULL</c>, the
+            value returned is <c>null</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1190,12 +1192,12 @@
       <Docs>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
         <summary>Retrieves the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as a  stream of
+            of this <c>ResultSet</c> object as a  stream of
             uninterpreted bytes.</summary>
         <returns>a Java input stream that delivers the database column value
                     as a stream of uninterpreted bytes;
-                    if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the value returned is
-                    &lt;code&gt;null&lt;/code&gt;</returns>
+                    if the value is SQL <c>NULL</c>, the value returned is
+                    <c>null</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1238,11 +1240,11 @@
       <Docs>
         <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <summary>Retrieves the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as a stream of uninterpreted
-            &lt;code&gt;byte&lt;/code&gt;s.</summary>
+            of this <c>ResultSet</c> object as a stream of uninterpreted
+            <c>byte</c>s.</summary>
         <returns>a Java input stream that delivers the database column value
             as a stream of uninterpreted bytes;
-            if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the result is &lt;code&gt;null&lt;/code&gt;</returns>
+            if the value is SQL <c>NULL</c>, the result is <c>null</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1285,10 +1287,10 @@
       <Docs>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
         <summary>Retrieves the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as a &lt;code&gt;Blob&lt;/code&gt; object
+            of this <c>ResultSet</c> object as a <c>Blob</c> object
             in the Java programming language.</summary>
-        <returns>a &lt;code&gt;Blob&lt;/code&gt; object representing the SQL
-                    &lt;code&gt;BLOB&lt;/code&gt; value in the specified column</returns>
+        <returns>a <c>Blob</c> object representing the SQL
+                    <c>BLOB</c> value in the specified column</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1331,9 +1333,9 @@
       <Docs>
         <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <summary>Retrieves the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as a &lt;code&gt;Blob&lt;/code&gt; object
+            of this <c>ResultSet</c> object as a <c>Blob</c> object
             in the Java programming language.</summary>
-        <returns>a &lt;code&gt;Blob&lt;/code&gt; object representing the SQL &lt;code&gt;BLOB&lt;/code&gt;
+        <returns>a <c>Blob</c> object representing the SQL <c>BLOB</c>
                     value in the specified column</returns>
         <remarks>
           <para>
@@ -1377,10 +1379,10 @@
       <Docs>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
         <summary>Retrieves the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as
-            a &lt;code&gt;boolean&lt;/code&gt; in the Java programming language.</summary>
-        <returns>the column value; if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the
-            value returned is &lt;code&gt;false&lt;/code&gt;</returns>
+            of this <c>ResultSet</c> object as
+            a <c>boolean</c> in the Java programming language.</summary>
+        <returns>the column value; if the value is SQL <c>NULL</c>, the
+            value returned is <c>false</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1423,10 +1425,10 @@
       <Docs>
         <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <summary>Retrieves the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as
-            a &lt;code&gt;boolean&lt;/code&gt; in the Java programming language.</summary>
-        <returns>the column value; if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the
-            value returned is &lt;code&gt;false&lt;/code&gt;</returns>
+            of this <c>ResultSet</c> object as
+            a <c>boolean</c> in the Java programming language.</summary>
+        <returns>the column value; if the value is SQL <c>NULL</c>, the
+            value returned is <c>false</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1469,10 +1471,10 @@
       <Docs>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
         <summary>Retrieves the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as
-            a &lt;code&gt;byte&lt;/code&gt; in the Java programming language.</summary>
-        <returns>the column value; if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the
-            value returned is &lt;code&gt;0&lt;/code&gt;</returns>
+            of this <c>ResultSet</c> object as
+            a <c>byte</c> in the Java programming language.</summary>
+        <returns>the column value; if the value is SQL <c>NULL</c>, the
+            value returned is <c>0</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1515,10 +1517,10 @@
       <Docs>
         <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <summary>Retrieves the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as
-            a &lt;code&gt;byte&lt;/code&gt; in the Java programming language.</summary>
-        <returns>the column value; if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the
-            value returned is &lt;code&gt;0&lt;/code&gt;</returns>
+            of this <c>ResultSet</c> object as
+            a <c>byte</c> in the Java programming language.</summary>
+        <returns>the column value; if the value is SQL <c>NULL</c>, the
+            value returned is <c>0</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1561,10 +1563,10 @@
       <Docs>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
         <summary>Retrieves the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as
-            a &lt;code&gt;byte&lt;/code&gt; array in the Java programming language.</summary>
-        <returns>the column value; if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the
-            value returned is &lt;code&gt;null&lt;/code&gt;</returns>
+            of this <c>ResultSet</c> object as
+            a <c>byte</c> array in the Java programming language.</summary>
+        <returns>the column value; if the value is SQL <c>NULL</c>, the
+            value returned is <c>null</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1607,10 +1609,10 @@
       <Docs>
         <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <summary>Retrieves the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as
-            a &lt;code&gt;byte&lt;/code&gt; array in the Java programming language.</summary>
-        <returns>the column value; if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the
-            value returned is &lt;code&gt;null&lt;/code&gt;</returns>
+            of this <c>ResultSet</c> object as
+            a <c>byte</c> array in the Java programming language.</summary>
+        <returns>the column value; if the value is SQL <c>NULL</c>, the
+            value returned is <c>null</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1653,11 +1655,11 @@
       <Docs>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
         <summary>Retrieves the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as a
-            &lt;code&gt;java.</summary>
-        <returns>a &lt;code&gt;java.io.Reader&lt;/code&gt; object that contains the column
-            value; if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the value returned is
-            &lt;code&gt;null&lt;/code&gt; in the Java programming language.</returns>
+            of this <c>ResultSet</c> object as a
+            <c>java.io.Reader</c> object.</summary>
+        <returns>a <c>java.io.Reader</c> object that contains the column
+            value; if the value is SQL <c>NULL</c>, the value returned is
+            <c>null</c> in the Java programming language.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1700,11 +1702,11 @@
       <Docs>
         <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <summary>Retrieves the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as a
-            &lt;code&gt;java.</summary>
-        <returns>a &lt;code&gt;java.io.Reader&lt;/code&gt; object that contains the column
-            value; if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the value returned is
-            &lt;code&gt;null&lt;/code&gt; in the Java programming language</returns>
+            of this <c>ResultSet</c> object as a
+            <c>java.io.Reader</c> object.</summary>
+        <returns>a <c>java.io.Reader</c> object that contains the column
+            value; if the value is SQL <c>NULL</c>, the value returned is
+            <c>null</c> in the Java programming language</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1747,10 +1749,10 @@
       <Docs>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
         <summary>Retrieves the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as a &lt;code&gt;Clob&lt;/code&gt; object
+            of this <c>ResultSet</c> object as a <c>Clob</c> object
             in the Java programming language.</summary>
-        <returns>a &lt;code&gt;Clob&lt;/code&gt; object representing the SQL
-                    &lt;code&gt;CLOB&lt;/code&gt; value in the specified column</returns>
+        <returns>a <c>Clob</c> object representing the SQL
+                    <c>CLOB</c> value in the specified column</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1793,9 +1795,9 @@
       <Docs>
         <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <summary>Retrieves the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as a &lt;code&gt;Clob&lt;/code&gt; object
+            of this <c>ResultSet</c> object as a <c>Clob</c> object
             in the Java programming language.</summary>
-        <returns>a &lt;code&gt;Clob&lt;/code&gt; object representing the SQL &lt;code&gt;CLOB&lt;/code&gt;
+        <returns>a <c>Clob</c> object representing the SQL <c>CLOB</c>
             value in the specified column</returns>
         <remarks>
           <para>
@@ -1839,10 +1841,10 @@
       <Docs>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
         <summary>Retrieves the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as
-            a &lt;code&gt;java.</summary>
-        <returns>the column value; if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the
-            value returned is &lt;code&gt;null&lt;/code&gt;</returns>
+            of this <c>ResultSet</c> object as
+            a <c>java.sql.Date</c> object in the Java programming language.</summary>
+        <returns>the column value; if the value is SQL <c>NULL</c>, the
+            value returned is <c>null</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1885,10 +1887,10 @@
       <Docs>
         <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <summary>Retrieves the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as
-            a &lt;code&gt;java.</summary>
-        <returns>the column value; if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the
-            value returned is &lt;code&gt;null&lt;/code&gt;</returns>
+            of this <c>ResultSet</c> object as
+            a <c>java.sql.Date</c> object in the Java programming language.</summary>
+        <returns>the column value; if the value is SQL <c>NULL</c>, the
+            value returned is <c>null</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1931,13 +1933,14 @@
       </Parameters>
       <Docs>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
-        <param name="cal">the &lt;code&gt;java.util.Calendar&lt;/code&gt; object
+        <param name="cal">the <c>java.util.Calendar</c> object
             to use in constructing the date</param>
         <summary>Retrieves the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as a &lt;code&gt;java.</summary>
-        <returns>the column value as a &lt;code&gt;java.sql.Date&lt;/code&gt; object;
-            if the value is SQL &lt;code&gt;NULL&lt;/code&gt;,
-            the value returned is &lt;code&gt;null&lt;/code&gt; in the Java programming language</returns>
+            of this <c>ResultSet</c> object as a <c>java.sql.Date</c> object
+            in the Java programming language.</summary>
+        <returns>the column value as a <c>java.sql.Date</c> object;
+            if the value is SQL <c>NULL</c>,
+            the value returned is <c>null</c> in the Java programming language</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1980,13 +1983,14 @@
       </Parameters>
       <Docs>
         <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
-        <param name="cal">the &lt;code&gt;java.util.Calendar&lt;/code&gt; object
+        <param name="cal">the <c>java.util.Calendar</c> object
             to use in constructing the date</param>
         <summary>Retrieves the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as a &lt;code&gt;java.</summary>
-        <returns>the column value as a &lt;code&gt;java.sql.Date&lt;/code&gt; object;
-            if the value is SQL &lt;code&gt;NULL&lt;/code&gt;,
-            the value returned is &lt;code&gt;null&lt;/code&gt; in the Java programming language</returns>
+            of this <c>ResultSet</c> object as a <c>java.sql.Date</c> object
+            in the Java programming language.</summary>
+        <returns>the column value as a <c>java.sql.Date</c> object;
+            if the value is SQL <c>NULL</c>,
+            the value returned is <c>null</c> in the Java programming language</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -2029,10 +2033,10 @@
       <Docs>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
         <summary>Retrieves the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as
-            a &lt;code&gt;double&lt;/code&gt; in the Java programming language.</summary>
-        <returns>the column value; if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the
-            value returned is &lt;code&gt;0&lt;/code&gt;</returns>
+            of this <c>ResultSet</c> object as
+            a <c>double</c> in the Java programming language.</summary>
+        <returns>the column value; if the value is SQL <c>NULL</c>, the
+            value returned is <c>0</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -2075,10 +2079,10 @@
       <Docs>
         <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <summary>Retrieves the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as
-            a &lt;code&gt;double&lt;/code&gt; in the Java programming language.</summary>
-        <returns>the column value; if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the
-            value returned is &lt;code&gt;0&lt;/code&gt;</returns>
+            of this <c>ResultSet</c> object as
+            a <c>double</c> in the Java programming language.</summary>
+        <returns>the column value; if the value is SQL <c>NULL</c>, the
+            value returned is <c>0</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -2121,10 +2125,10 @@
       <Docs>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
         <summary>Retrieves the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as
-            a &lt;code&gt;float&lt;/code&gt; in the Java programming language.</summary>
-        <returns>the column value; if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the
-            value returned is &lt;code&gt;0&lt;/code&gt;</returns>
+            of this <c>ResultSet</c> object as
+            a <c>float</c> in the Java programming language.</summary>
+        <returns>the column value; if the value is SQL <c>NULL</c>, the
+            value returned is <c>0</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -2167,10 +2171,10 @@
       <Docs>
         <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <summary>Retrieves the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as
-            a &lt;code&gt;float&lt;/code&gt; in the Java programming language.</summary>
-        <returns>the column value; if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the
-            value returned is &lt;code&gt;0&lt;/code&gt;</returns>
+            of this <c>ResultSet</c> object as
+            a <c>float</c> in the Java programming language.</summary>
+        <returns>the column value; if the value is SQL <c>NULL</c>, the
+            value returned is <c>0</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -2213,10 +2217,10 @@
       <Docs>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
         <summary>Retrieves the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as
-            an &lt;code&gt;int&lt;/code&gt; in the Java programming language.</summary>
-        <returns>the column value; if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the
-            value returned is &lt;code&gt;0&lt;/code&gt;</returns>
+            of this <c>ResultSet</c> object as
+            an <c>int</c> in the Java programming language.</summary>
+        <returns>the column value; if the value is SQL <c>NULL</c>, the
+            value returned is <c>0</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -2259,10 +2263,10 @@
       <Docs>
         <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <summary>Retrieves the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as
-            an &lt;code&gt;int&lt;/code&gt; in the Java programming language.</summary>
-        <returns>the column value; if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the
-            value returned is &lt;code&gt;0&lt;/code&gt;</returns>
+            of this <c>ResultSet</c> object as
+            an <c>int</c> in the Java programming language.</summary>
+        <returns>the column value; if the value is SQL <c>NULL</c>, the
+            value returned is <c>0</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -2305,10 +2309,10 @@
       <Docs>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
         <summary>Retrieves the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as
-            a &lt;code&gt;long&lt;/code&gt; in the Java programming language.</summary>
-        <returns>the column value; if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the
-            value returned is &lt;code&gt;0&lt;/code&gt;</returns>
+            of this <c>ResultSet</c> object as
+            a <c>long</c> in the Java programming language.</summary>
+        <returns>the column value; if the value is SQL <c>NULL</c>, the
+            value returned is <c>0</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -2351,10 +2355,10 @@
       <Docs>
         <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <summary>Retrieves the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as
-            a &lt;code&gt;long&lt;/code&gt; in the Java programming language.</summary>
-        <returns>the column value; if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the
-            value returned is &lt;code&gt;0&lt;/code&gt;</returns>
+            of this <c>ResultSet</c> object as
+            a <c>long</c> in the Java programming language.</summary>
+        <returns>the column value; if the value is SQL <c>NULL</c>, the
+            value returned is <c>0</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -2397,11 +2401,11 @@
       <Docs>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
         <summary>Retrieves the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as a
-            &lt;code&gt;java.</summary>
-        <returns>a &lt;code&gt;java.io.Reader&lt;/code&gt; object that contains the column
-            value; if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the value returned is
-            &lt;code&gt;null&lt;/code&gt; in the Java programming language.</returns>
+            of this <c>ResultSet</c> object as a
+            <c>java.io.Reader</c> object.</summary>
+        <returns>a <c>java.io.Reader</c> object that contains the column
+            value; if the value is SQL <c>NULL</c>, the value returned is
+            <c>null</c> in the Java programming language.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -2443,11 +2447,11 @@
       <Docs>
         <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <summary>Retrieves the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as a
-            &lt;code&gt;java.</summary>
-        <returns>a &lt;code&gt;java.io.Reader&lt;/code&gt; object that contains the column
-            value; if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the value returned is
-            &lt;code&gt;null&lt;/code&gt; in the Java programming language</returns>
+            of this <c>ResultSet</c> object as a
+            <c>java.io.Reader</c> object.</summary>
+        <returns>a <c>java.io.Reader</c> object that contains the column
+            value; if the value is SQL <c>NULL</c>, the value returned is
+            <c>null</c> in the Java programming language</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -2489,10 +2493,10 @@
       <Docs>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
         <summary>Retrieves the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as a &lt;code&gt;NClob&lt;/code&gt; object
+            of this <c>ResultSet</c> object as a <c>NClob</c> object
             in the Java programming language.</summary>
-        <returns>a &lt;code&gt;NClob&lt;/code&gt; object representing the SQL
-                    &lt;code&gt;NCLOB&lt;/code&gt; value in the specified column</returns>
+        <returns>a <c>NClob</c> object representing the SQL
+                    <c>NCLOB</c> value in the specified column</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -2534,9 +2538,9 @@
       <Docs>
         <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <summary>Retrieves the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as a &lt;code&gt;NClob&lt;/code&gt; object
+            of this <c>ResultSet</c> object as a <c>NClob</c> object
             in the Java programming language.</summary>
-        <returns>a &lt;code&gt;NClob&lt;/code&gt; object representing the SQL &lt;code&gt;NCLOB&lt;/code&gt;
+        <returns>a <c>NClob</c> object representing the SQL <c>NCLOB</c>
             value in the specified column</returns>
         <remarks>
           <para>
@@ -2579,10 +2583,10 @@
       <Docs>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
         <summary>Retrieves the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as
-            a &lt;code&gt;String&lt;/code&gt; in the Java programming language.</summary>
-        <returns>the column value; if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the
-            value returned is &lt;code&gt;null&lt;/code&gt;</returns>
+            of this <c>ResultSet</c> object as
+            a <c>String</c> in the Java programming language.</summary>
+        <returns>the column value; if the value is SQL <c>NULL</c>, the
+            value returned is <c>null</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -2624,10 +2628,10 @@
       <Docs>
         <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <summary>Retrieves the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as
-            a &lt;code&gt;String&lt;/code&gt; in the Java programming language.</summary>
-        <returns>the column value; if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the
-            value returned is &lt;code&gt;null&lt;/code&gt;</returns>
+            of this <c>ResultSet</c> object as
+            a <c>String</c> in the Java programming language.</summary>
+        <returns>the column value; if the value is SQL <c>NULL</c>, the
+            value returned is <c>null</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -2669,9 +2673,9 @@
       <Docs>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
         <summary>Gets the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as
-            an &lt;code&gt;Object&lt;/code&gt; in the Java programming language.</summary>
-        <returns>a &lt;code&gt;java.lang.Object&lt;/code&gt; holding the column value</returns>
+            of this <c>ResultSet</c> object as
+            an <c>Object</c> in the Java programming language.</summary>
+        <returns>a <c>java.lang.Object</c> holding the column value</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -2714,9 +2718,9 @@
       <Docs>
         <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <summary>Gets the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as
-            an &lt;code&gt;Object&lt;/code&gt; in the Java programming language.</summary>
-        <returns>a &lt;code&gt;java.lang.Object&lt;/code&gt; holding the column value</returns>
+            of this <c>ResultSet</c> object as
+            an <c>Object</c> in the Java programming language.</summary>
+        <returns>a <c>java.lang.Object</c> holding the column value</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -2759,12 +2763,12 @@
       </Parameters>
       <Docs>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
-        <param name="map">a &lt;code&gt;java.util.Map&lt;/code&gt; object that contains the mapping
+        <param name="map">a <c>java.util.Map</c> object that contains the mapping
             from SQL type names to classes in the Java programming language</param>
         <summary>Retrieves the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as an &lt;code&gt;Object&lt;/code&gt;
+            of this <c>ResultSet</c> object as an <c>Object</c>
             in the Java programming language.</summary>
-        <returns>an &lt;code&gt;Object&lt;/code&gt; in the Java programming language
+        <returns>an <c>Object</c> in the Java programming language
             representing the SQL value</returns>
         <remarks>
           <para>
@@ -2805,12 +2809,12 @@
       </Parameters>
       <Docs>
         <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
-        <param name="map">a &lt;code&gt;java.util.Map&lt;/code&gt; object that contains the mapping
+        <param name="map">a <c>java.util.Map</c> object that contains the mapping
             from SQL type names to classes in the Java programming language</param>
         <summary>Retrieves the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as an &lt;code&gt;Object&lt;/code&gt;
+            of this <c>ResultSet</c> object as an <c>Object</c>
             in the Java programming language.</summary>
-        <returns>an &lt;code&gt;Object&lt;/code&gt; representing the SQL value in the
+        <returns>an <c>Object</c> representing the SQL value in the
                     specified column</returns>
         <remarks>
           <para>
@@ -2851,9 +2855,9 @@
       <Docs>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
         <summary>Retrieves the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as a &lt;code&gt;Ref&lt;/code&gt; object
+            of this <c>ResultSet</c> object as a <c>Ref</c> object
             in the Java programming language.</summary>
-        <returns>a &lt;code&gt;Ref&lt;/code&gt; object representing an SQL &lt;code&gt;REF&lt;/code&gt;
+        <returns>a <c>Ref</c> object representing an SQL <c>REF</c>
                     value</returns>
         <remarks>
           <para>
@@ -2897,9 +2901,9 @@
       <Docs>
         <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <summary>Retrieves the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as a &lt;code&gt;Ref&lt;/code&gt; object
+            of this <c>ResultSet</c> object as a <c>Ref</c> object
             in the Java programming language.</summary>
-        <returns>a &lt;code&gt;Ref&lt;/code&gt; object representing the SQL &lt;code&gt;REF&lt;/code&gt;
+        <returns>a <c>Ref</c> object representing the SQL <c>REF</c>
                     value in the specified column</returns>
         <remarks>
           <para>
@@ -2943,9 +2947,10 @@
       <Docs>
         <param name="columnIndex">the first column is 1, the second 2, ...</param>
         <summary>Retrieves the value of the designated column in the current row of this
-            &lt;code&gt;ResultSet&lt;/code&gt; object as a &lt;code&gt;java.</summary>
-        <returns>the column value; if the value is a SQL &lt;code&gt;NULL&lt;/code&gt; the
-                value returned is &lt;code&gt;null&lt;/code&gt;</returns>
+            <c>ResultSet</c> object as a <c>java.sql.RowId</c> object in the Java
+            programming language.</summary>
+        <returns>the column value; if the value is a SQL <c>NULL</c> the
+                value returned is <c>null</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -2987,9 +2992,10 @@
       <Docs>
         <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <summary>Retrieves the value of the designated column in the current row of this
-            &lt;code&gt;ResultSet&lt;/code&gt; object as a &lt;code&gt;java.</summary>
-        <returns>the column value ; if the value is a SQL &lt;code&gt;NULL&lt;/code&gt; the
-                value returned is &lt;code&gt;null&lt;/code&gt;</returns>
+            <c>ResultSet</c> object as a <c>java.sql.RowId</c> object in the Java
+            programming language.</summary>
+        <returns>the column value ; if the value is a SQL <c>NULL</c> the
+                value returned is <c>null</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -3031,10 +3037,10 @@
       <Docs>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
         <summary>Retrieves the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as
-            a &lt;code&gt;short&lt;/code&gt; in the Java programming language.</summary>
-        <returns>the column value; if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the
-            value returned is &lt;code&gt;0&lt;/code&gt;</returns>
+            of this <c>ResultSet</c> object as
+            a <c>short</c> in the Java programming language.</summary>
+        <returns>the column value; if the value is SQL <c>NULL</c>, the
+            value returned is <c>0</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -3077,10 +3083,10 @@
       <Docs>
         <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <summary>Retrieves the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as
-            a &lt;code&gt;short&lt;/code&gt; in the Java programming language.</summary>
-        <returns>the column value; if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the
-            value returned is &lt;code&gt;0&lt;/code&gt;</returns>
+            of this <c>ResultSet</c> object as
+            a <c>short</c> in the Java programming language.</summary>
+        <returns>the column value; if the value is SQL <c>NULL</c>, the
+            value returned is <c>0</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -3123,9 +3129,9 @@
       <Docs>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
         <summary>Retrieves the value of the designated column in  the current row of
-             this &lt;code&gt;ResultSet&lt;/code&gt; as a
-            &lt;code&gt;java.</summary>
-        <returns>a &lt;code&gt;SQLXML&lt;/code&gt; object that maps an &lt;code&gt;SQL XML&lt;/code&gt; value</returns>
+             this <c>ResultSet</c> as a
+            <c>java.sql.SQLXML</c> object in the Java programming language.</summary>
+        <returns>a <c>SQLXML</c> object that maps an <c>SQL XML</c> value</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -3167,9 +3173,9 @@
       <Docs>
         <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <summary>Retrieves the value of the designated column in  the current row of
-             this &lt;code&gt;ResultSet&lt;/code&gt; as a
-            &lt;code&gt;java.</summary>
-        <returns>a &lt;code&gt;SQLXML&lt;/code&gt; object that maps an &lt;code&gt;SQL XML&lt;/code&gt; value</returns>
+             this <c>ResultSet</c> as a
+            <c>java.sql.SQLXML</c> object in the Java programming language.</summary>
+        <returns>a <c>SQLXML</c> object that maps an <c>SQL XML</c> value</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -3211,10 +3217,10 @@
       <Docs>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
         <summary>Retrieves the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as
-            a &lt;code&gt;String&lt;/code&gt; in the Java programming language.</summary>
-        <returns>the column value; if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the
-            value returned is &lt;code&gt;null&lt;/code&gt;</returns>
+            of this <c>ResultSet</c> object as
+            a <c>String</c> in the Java programming language.</summary>
+        <returns>the column value; if the value is SQL <c>NULL</c>, the
+            value returned is <c>null</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -3257,10 +3263,10 @@
       <Docs>
         <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <summary>Retrieves the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as
-            a &lt;code&gt;String&lt;/code&gt; in the Java programming language.</summary>
-        <returns>the column value; if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the
-            value returned is &lt;code&gt;null&lt;/code&gt;</returns>
+            of this <c>ResultSet</c> object as
+            a <c>String</c> in the Java programming language.</summary>
+        <returns>the column value; if the value is SQL <c>NULL</c>, the
+            value returned is <c>null</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -3303,10 +3309,10 @@
       <Docs>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
         <summary>Retrieves the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as
-            a &lt;code&gt;java.</summary>
-        <returns>the column value; if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the
-            value returned is &lt;code&gt;null&lt;/code&gt;</returns>
+            of this <c>ResultSet</c> object as
+            a <c>java.sql.Time</c> object in the Java programming language.</summary>
+        <returns>the column value; if the value is SQL <c>NULL</c>, the
+            value returned is <c>null</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -3349,11 +3355,11 @@
       <Docs>
         <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <summary>Retrieves the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as
-            a &lt;code&gt;java.</summary>
+            of this <c>ResultSet</c> object as
+            a <c>java.sql.Time</c> object in the Java programming language.</summary>
         <returns>the column value;
-            if the value is SQL &lt;code&gt;NULL&lt;/code&gt;,
-            the value returned is &lt;code&gt;null&lt;/code&gt;</returns>
+            if the value is SQL <c>NULL</c>,
+            the value returned is <c>null</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -3396,13 +3402,14 @@
       </Parameters>
       <Docs>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
-        <param name="cal">the &lt;code&gt;java.util.Calendar&lt;/code&gt; object
+        <param name="cal">the <c>java.util.Calendar</c> object
             to use in constructing the time</param>
         <summary>Retrieves the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as a &lt;code&gt;java.</summary>
-        <returns>the column value as a &lt;code&gt;java.sql.Time&lt;/code&gt; object;
-            if the value is SQL &lt;code&gt;NULL&lt;/code&gt;,
-            the value returned is &lt;code&gt;null&lt;/code&gt; in the Java programming language</returns>
+            of this <c>ResultSet</c> object as a <c>java.sql.Time</c> object
+            in the Java programming language.</summary>
+        <returns>the column value as a <c>java.sql.Time</c> object;
+            if the value is SQL <c>NULL</c>,
+            the value returned is <c>null</c> in the Java programming language</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -3445,13 +3452,14 @@
       </Parameters>
       <Docs>
         <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
-        <param name="cal">the &lt;code&gt;java.util.Calendar&lt;/code&gt; object
+        <param name="cal">the <c>java.util.Calendar</c> object
             to use in constructing the time</param>
         <summary>Retrieves the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as a &lt;code&gt;java.</summary>
-        <returns>the column value as a &lt;code&gt;java.sql.Time&lt;/code&gt; object;
-            if the value is SQL &lt;code&gt;NULL&lt;/code&gt;,
-            the value returned is &lt;code&gt;null&lt;/code&gt; in the Java programming language</returns>
+            of this <c>ResultSet</c> object as a <c>java.sql.Time</c> object
+            in the Java programming language.</summary>
+        <returns>the column value as a <c>java.sql.Time</c> object;
+            if the value is SQL <c>NULL</c>,
+            the value returned is <c>null</c> in the Java programming language</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -3494,10 +3502,10 @@
       <Docs>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
         <summary>Retrieves the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as
-            a &lt;code&gt;java.</summary>
-        <returns>the column value; if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the
-            value returned is &lt;code&gt;null&lt;/code&gt;</returns>
+            of this <c>ResultSet</c> object as
+            a <c>java.sql.Timestamp</c> object in the Java programming language.</summary>
+        <returns>the column value; if the value is SQL <c>NULL</c>, the
+            value returned is <c>null</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -3540,10 +3548,10 @@
       <Docs>
         <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <summary>Retrieves the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as
-            a &lt;code&gt;java.</summary>
-        <returns>the column value; if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the
-            value returned is &lt;code&gt;null&lt;/code&gt;</returns>
+            of this <c>ResultSet</c> object as
+            a <c>java.sql.Timestamp</c> object in the Java programming language.</summary>
+        <returns>the column value; if the value is SQL <c>NULL</c>, the
+            value returned is <c>null</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -3586,13 +3594,14 @@
       </Parameters>
       <Docs>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
-        <param name="cal">the &lt;code&gt;java.util.Calendar&lt;/code&gt; object
+        <param name="cal">the <c>java.util.Calendar</c> object
             to use in constructing the timestamp</param>
         <summary>Retrieves the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as a &lt;code&gt;java.</summary>
-        <returns>the column value as a &lt;code&gt;java.sql.Timestamp&lt;/code&gt; object;
-            if the value is SQL &lt;code&gt;NULL&lt;/code&gt;,
-            the value returned is &lt;code&gt;null&lt;/code&gt; in the Java programming language</returns>
+            of this <c>ResultSet</c> object as a <c>java.sql.Timestamp</c> object
+            in the Java programming language.</summary>
+        <returns>the column value as a <c>java.sql.Timestamp</c> object;
+            if the value is SQL <c>NULL</c>,
+            the value returned is <c>null</c> in the Java programming language</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -3635,13 +3644,14 @@
       </Parameters>
       <Docs>
         <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
-        <param name="cal">the &lt;code&gt;java.util.Calendar&lt;/code&gt; object
+        <param name="cal">the <c>java.util.Calendar</c> object
             to use in constructing the date</param>
         <summary>Retrieves the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as a &lt;code&gt;java.</summary>
-        <returns>the column value as a &lt;code&gt;java.sql.Timestamp&lt;/code&gt; object;
-            if the value is SQL &lt;code&gt;NULL&lt;/code&gt;,
-            the value returned is &lt;code&gt;null&lt;/code&gt; in the Java programming language</returns>
+            of this <c>ResultSet</c> object as a <c>java.sql.Timestamp</c> object
+            in the Java programming language.</summary>
+        <returns>the column value as a <c>java.sql.Timestamp</c> object;
+            if the value is SQL <c>NULL</c>,
+            the value returned is <c>null</c> in the Java programming language</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -3688,12 +3698,12 @@
       <Docs>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
         <summary>Retrieves the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as
+            of this <c>ResultSet</c> object as
             as a stream of two-byte 3 characters.</summary>
         <returns>a Java input stream that delivers the database column value
                     as a stream of two-byte Unicode characters;
-                    if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the value returned is
-                    &lt;code&gt;null&lt;/code&gt;</returns>
+                    if the value is SQL <c>NULL</c>, the value returned is
+                    <c>null</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -3740,12 +3750,12 @@
       <Docs>
         <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <summary>Retrieves the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as a stream of two-byte
+            of this <c>ResultSet</c> object as a stream of two-byte
             Unicode characters.</summary>
         <returns>a Java input stream that delivers the database column value
                     as a stream of two-byte Unicode characters.
-                    If the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the value returned
-                    is &lt;code&gt;null&lt;/code&gt;.</returns>
+                    If the value is SQL <c>NULL</c>, the value returned
+                    is <c>null</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -3788,10 +3798,11 @@
       <Docs>
         <param name="columnIndex">the index of the column 1 is the first, 2 is the second,...</param>
         <summary>Retrieves the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as a &lt;code&gt;java.</summary>
-        <returns>the column value as a &lt;code&gt;java.net.URL&lt;/code&gt; object;
-            if the value is SQL &lt;code&gt;NULL&lt;/code&gt;,
-            the value returned is &lt;code&gt;null&lt;/code&gt; in the Java programming language</returns>
+            of this <c>ResultSet</c> object as a <c>java.net.URL</c>
+            object in the Java programming language.</summary>
+        <returns>the column value as a <c>java.net.URL</c> object;
+            if the value is SQL <c>NULL</c>,
+            the value returned is <c>null</c> in the Java programming language</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -3834,10 +3845,11 @@
       <Docs>
         <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <summary>Retrieves the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as a &lt;code&gt;java.</summary>
-        <returns>the column value as a &lt;code&gt;java.net.URL&lt;/code&gt; object;
-            if the value is SQL &lt;code&gt;NULL&lt;/code&gt;,
-            the value returned is &lt;code&gt;null&lt;/code&gt; in the Java programming language</returns>
+            of this <c>ResultSet</c> object as a <c>java.net.URL</c>
+            object in the Java programming language.</summary>
+        <returns>the column value as a <c>java.net.URL</c> object;
+            if the value is SQL <c>NULL</c>,
+            the value returned is <c>null</c> in the Java programming language</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -3906,7 +3918,7 @@
       </ReturnValue>
       <MemberValue>1</MemberValue>
       <Docs>
-        <summary>The constant indicating that open &lt;code&gt;ResultSet&lt;/code&gt; objects with this
+        <summary>The constant indicating that open <c>ResultSet</c> objects with this
             holdability will remain open when the current transaction is commited.</summary>
         <remarks>
           <para>
@@ -3944,7 +3956,7 @@
       <Parameters />
       <Docs>
         <summary>Inserts the contents of the insert row into this
-            &lt;code&gt;ResultSet&lt;/code&gt; object and into the database.</summary>
+            <c>ResultSet</c> object and into the database.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -4136,9 +4148,10 @@
       <Parameters />
       <Docs>
         <summary>Moves the cursor to the last row in
-            this &lt;code&gt;ResultSet&lt;/code&gt; object.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if the cursor is on a valid row;
-            &lt;code&gt;false&lt;/code&gt; if there are no rows in the result set</returns>
+            this <c>ResultSet</c> object.</summary>
+        <returns>
+          <c>true</c> if the cursor is on a valid row;
+            <c>false</c> if there are no rows in the result set</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -4287,8 +4300,9 @@
       <Parameters />
       <Docs>
         <summary>Moves the cursor froward one row from its current position.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if the new current row is valid;
-            &lt;code&gt;false&lt;/code&gt; if there are no more rows</returns>
+        <returns>
+          <c>true</c> if the new current row is valid;
+            <c>false</c> if there are no more rows</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -4328,9 +4342,10 @@
       <Parameters />
       <Docs>
         <summary>Moves the cursor to the previous row in this
-            &lt;code&gt;ResultSet&lt;/code&gt; object.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if the cursor is now positioned on a valid row;
-            &lt;code&gt;false&lt;/code&gt; if the cursor is positioned before the first row</returns>
+            <c>ResultSet</c> object.</summary>
+        <returns>
+          <c>true</c> if the cursor is now positioned on a valid row;
+            <c>false</c> if the cursor is positioned before the first row</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -4412,12 +4427,13 @@
         <Parameter Name="rows" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="rows">an &lt;code&gt;int&lt;/code&gt; specifying the number of rows to
+        <param name="rows">an <c>int</c> specifying the number of rows to
                    move from the current row; a positive number moves the cursor
                    forward; a negative number moves the cursor backward</param>
         <summary>Moves the cursor a relative number of rows, either positive or negative.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if the cursor is on a row;
-                    &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if the cursor is on a row;
+                    <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -4487,8 +4503,9 @@
       <Parameters />
       <Docs>
         <summary>Retrieves whether a row has been deleted.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if the current row is detected to
-            have been deleted by the owner or another; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if the current row is detected to
+            have been deleted by the owner or another; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -4528,8 +4545,9 @@
       <Parameters />
       <Docs>
         <summary>Retrieves whether the current row has had an insertion.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if the current row is detected to
-            have been inserted; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if the current row is detected to
+            have been inserted; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -4569,8 +4587,9 @@
       <Parameters />
       <Docs>
         <summary>Retrieves whether the current row has been updated.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if the current row is detected to
-            have been visibly updated by the owner or another; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if the current row is detected to
+            have been visibly updated by the owner or another; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -4669,7 +4688,7 @@
       </ReturnValue>
       <MemberValue>1003</MemberValue>
       <Docs>
-        <summary>The constant indicating the type for a &lt;code&gt;ResultSet&lt;/code&gt; object
+        <summary>The constant indicating the type for a <c>ResultSet</c> object
             whose cursor may move only forward.</summary>
         <remarks>
           <para>
@@ -4706,9 +4725,9 @@
       </ReturnValue>
       <MemberValue>1004</MemberValue>
       <Docs>
-        <summary>The constant indicating the type for a &lt;code&gt;ResultSet&lt;/code&gt; object
+        <summary>The constant indicating the type for a <c>ResultSet</c> object
             that is scrollable but generally not sensitive to changes to the data
-            that underlies the &lt;code&gt;ResultSet&lt;/code&gt;.</summary>
+            that underlies the <c>ResultSet</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -4744,9 +4763,9 @@
       </ReturnValue>
       <MemberValue>1005</MemberValue>
       <Docs>
-        <summary>The constant indicating the type for a &lt;code&gt;ResultSet&lt;/code&gt; object
+        <summary>The constant indicating the type for a <c>ResultSet</c> object
             that is scrollable and generally sensitive to changes to the data
-            that underlies the &lt;code&gt;ResultSet&lt;/code&gt;.</summary>
+            that underlies the <c>ResultSet</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -4787,7 +4806,7 @@
       <Docs>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
         <param name="x">the new column value</param>
-        <summary>Updates the designated column with a &lt;code&gt;java.</summary>
+        <summary>Updates the designated column with a <c>java.sql.Array</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -4831,7 +4850,7 @@
       <Docs>
         <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <param name="x">the new column value</param>
-        <summary>Updates the designated column with a &lt;code&gt;java.</summary>
+        <summary>Updates the designated column with a <c>java.sql.Array</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -5147,7 +5166,8 @@
       <Docs>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
         <param name="x">the new column value</param>
-        <summary>Updates the designated column with a &lt;code&gt;java.</summary>
+        <summary>Updates the designated column with a <c>java.math.BigDecimal</c>
+            value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -5191,7 +5211,8 @@
       <Docs>
         <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <param name="x">the new column value</param>
-        <summary>Updates the designated column with a &lt;code&gt;java.</summary>
+        <summary>Updates the designated column with a <c>java.sql.BigDecimal</c>
+            value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -5507,7 +5528,7 @@
       <Docs>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
         <param name="x">the new column value</param>
-        <summary>Updates the designated column with a &lt;code&gt;java.</summary>
+        <summary>Updates the designated column with a <c>java.sql.Blob</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -5595,7 +5616,7 @@
       <Docs>
         <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <param name="x">the new column value</param>
-        <summary>Updates the designated column with a &lt;code&gt;java.</summary>
+        <summary>Updates the designated column with a <c>java.sql.Blob</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -5777,7 +5798,7 @@
       <Docs>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
         <param name="x">the new column value</param>
-        <summary>Updates the designated column with a &lt;code&gt;boolean&lt;/code&gt; value.</summary>
+        <summary>Updates the designated column with a <c>boolean</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -5821,7 +5842,7 @@
       <Docs>
         <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <param name="x">the new column value</param>
-        <summary>Updates the designated column with a &lt;code&gt;boolean&lt;/code&gt; value.</summary>
+        <summary>Updates the designated column with a <c>boolean</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -5865,7 +5886,7 @@
       <Docs>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
         <param name="x">the new column value</param>
-        <summary>Updates the designated column with a &lt;code&gt;byte&lt;/code&gt; value.</summary>
+        <summary>Updates the designated column with a <c>byte</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -5909,7 +5930,7 @@
       <Docs>
         <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <param name="x">the new column value</param>
-        <summary>Updates the designated column with a &lt;code&gt;byte&lt;/code&gt; value.</summary>
+        <summary>Updates the designated column with a <c>byte</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -5953,7 +5974,7 @@
       <Docs>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
         <param name="x">the new column value</param>
-        <summary>Updates the designated column with a &lt;code&gt;byte&lt;/code&gt; array value.</summary>
+        <summary>Updates the designated column with a <c>byte</c> array value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -6083,7 +6104,7 @@
       </Parameters>
       <Docs>
         <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
-        <param name="reader">the &lt;code&gt;java.io.Reader&lt;/code&gt; object containing
+        <param name="reader">the <c>java.io.Reader</c> object containing
                    the new column value</param>
         <summary>Updates the designated column with a character stream value.</summary>
         <remarks>
@@ -6221,7 +6242,7 @@
       </Parameters>
       <Docs>
         <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
-        <param name="reader">the &lt;code&gt;java.io.Reader&lt;/code&gt; object containing
+        <param name="reader">the <c>java.io.Reader</c> object containing
                    the new column value</param>
         <param name="length">the length of the stream</param>
         <summary>Updates the designated column with a character stream value, which will have
@@ -6269,7 +6290,7 @@
       </Parameters>
       <Docs>
         <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
-        <param name="reader">the &lt;code&gt;java.io.Reader&lt;/code&gt; object containing
+        <param name="reader">the <c>java.io.Reader</c> object containing
                    the new column value</param>
         <param name="length">the length of the stream</param>
         <summary>Updates the designated column with a character stream value, which will have
@@ -6316,7 +6337,7 @@
       <Docs>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
         <param name="reader">An object that contains the data to set the parameter value to.</param>
-        <summary>Updates the designated column using the given &lt;code&gt;Reader&lt;/code&gt;
+        <summary>Updates the designated column using the given <c>Reader</c>
             object.</summary>
         <remarks>
           <para>
@@ -6360,7 +6381,7 @@
       <Docs>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
         <param name="x">the new column value</param>
-        <summary>Updates the designated column with a &lt;code&gt;java.</summary>
+        <summary>Updates the designated column with a <c>java.sql.Clob</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -6404,7 +6425,7 @@
       <Docs>
         <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <param name="reader">An object that contains the data to set the parameter value to.</param>
-        <summary>Updates the designated column using the given &lt;code&gt;Reader&lt;/code&gt;
+        <summary>Updates the designated column using the given <c>Reader</c>
             object.</summary>
         <remarks>
           <para>
@@ -6448,7 +6469,7 @@
       <Docs>
         <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <param name="x">the new column value</param>
-        <summary>Updates the designated column with a &lt;code&gt;java.</summary>
+        <summary>Updates the designated column with a <c>java.sql.Clob</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -6494,7 +6515,7 @@
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
         <param name="reader">An object that contains the data to set the parameter value to.</param>
         <param name="length">the number of characters in the parameter data.</param>
-        <summary>Updates the designated column using the given &lt;code&gt;Reader&lt;/code&gt;
+        <summary>Updates the designated column using the given <c>Reader</c>
             object, which is the given number of characters long.</summary>
         <remarks>
           <para>
@@ -6540,7 +6561,7 @@
         <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <param name="reader">An object that contains the data to set the parameter value to.</param>
         <param name="length">the number of characters in the parameter data.</param>
-        <summary>Updates the designated column using the given &lt;code&gt;Reader&lt;/code&gt;
+        <summary>Updates the designated column using the given <c>Reader</c>
             object, which is the given number of characters long.</summary>
         <remarks>
           <para>
@@ -6584,7 +6605,7 @@
       <Docs>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
         <param name="x">the new column value</param>
-        <summary>Updates the designated column with a &lt;code&gt;java.</summary>
+        <summary>Updates the designated column with a <c>java.sql.Date</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -6628,7 +6649,7 @@
       <Docs>
         <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <param name="x">the new column value</param>
-        <summary>Updates the designated column with a &lt;code&gt;java.</summary>
+        <summary>Updates the designated column with a <c>java.sql.Date</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -6672,7 +6693,7 @@
       <Docs>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
         <param name="x">the new column value</param>
-        <summary>Updates the designated column with a &lt;code&gt;double&lt;/code&gt; value.</summary>
+        <summary>Updates the designated column with a <c>double</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -6716,7 +6737,7 @@
       <Docs>
         <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <param name="x">the new column value</param>
-        <summary>Updates the designated column with a &lt;code&gt;double&lt;/code&gt; value.</summary>
+        <summary>Updates the designated column with a <c>double</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -6760,7 +6781,7 @@
       <Docs>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
         <param name="x">the new column value</param>
-        <summary>Updates the designated column with a &lt;code&gt;float&lt;/code&gt; value.</summary>
+        <summary>Updates the designated column with a <c>float</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -6804,7 +6825,7 @@
       <Docs>
         <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <param name="x">the new column value</param>
-        <summary>Updates the designated column with a &lt;code&gt;float &lt;/code&gt; value.</summary>
+        <summary>Updates the designated column with a <c>float </c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -6848,7 +6869,7 @@
       <Docs>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
         <param name="x">the new column value</param>
-        <summary>Updates the designated column with an &lt;code&gt;int&lt;/code&gt; value.</summary>
+        <summary>Updates the designated column with an <c>int</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -6892,7 +6913,7 @@
       <Docs>
         <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <param name="x">the new column value</param>
-        <summary>Updates the designated column with an &lt;code&gt;int&lt;/code&gt; value.</summary>
+        <summary>Updates the designated column with an <c>int</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -6936,7 +6957,7 @@
       <Docs>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
         <param name="x">the new column value</param>
-        <summary>Updates the designated column with a &lt;code&gt;long&lt;/code&gt; value.</summary>
+        <summary>Updates the designated column with a <c>long</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -6980,7 +7001,7 @@
       <Docs>
         <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <param name="x">the new column value</param>
-        <summary>Updates the designated column with a &lt;code&gt;long&lt;/code&gt; value.</summary>
+        <summary>Updates the designated column with a <c>long</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -7066,7 +7087,7 @@
       </Parameters>
       <Docs>
         <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
-        <param name="reader">the &lt;code&gt;java.io.Reader&lt;/code&gt; object containing
+        <param name="reader">the <c>java.io.Reader</c> object containing
                    the new column value</param>
         <summary>Updates the designated column with a character stream value.</summary>
         <remarks>
@@ -7157,7 +7178,7 @@
       </Parameters>
       <Docs>
         <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
-        <param name="reader">the &lt;code&gt;java.io.Reader&lt;/code&gt; object containing
+        <param name="reader">the <c>java.io.Reader</c> object containing
                    the new column value</param>
         <param name="length">the length of the stream</param>
         <summary>Updates the designated column with a character stream value, which will have
@@ -7204,7 +7225,7 @@
       <Docs>
         <param name="columnIndex">the first column is 1, the second 2, ...</param>
         <param name="reader">An object that contains the data to set the parameter value to.</param>
-        <summary>Updates the designated column using the given &lt;code&gt;Reader&lt;/code&gt;
+        <summary>Updates the designated column using the given <c>Reader</c>
             
             The data will be read from the stream
             as needed until end-of-stream is reached.</summary>
@@ -7250,7 +7271,7 @@
       <Docs>
         <param name="columnIndex">the first column is 1, the second 2, ...</param>
         <param name="nClob">the value for the column to be updated</param>
-        <summary>Updates the designated column with a &lt;code&gt;java.</summary>
+        <summary>Updates the designated column with a <c>java.sql.NClob</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -7293,7 +7314,7 @@
       <Docs>
         <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <param name="reader">An object that contains the data to set the parameter value to.</param>
-        <summary>Updates the designated column using the given &lt;code&gt;Reader&lt;/code&gt;
+        <summary>Updates the designated column using the given <c>Reader</c>
             object.</summary>
         <remarks>
           <para>
@@ -7337,7 +7358,7 @@
       <Docs>
         <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <param name="nClob">the value for the column to be updated</param>
-        <summary>Updates the designated column with a &lt;code&gt;java.</summary>
+        <summary>Updates the designated column with a <c>java.sql.NClob</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -7382,7 +7403,7 @@
         <param name="columnIndex">the first column is 1, the second 2, ...</param>
         <param name="reader">An object that contains the data to set the parameter value to.</param>
         <param name="length">the number of characters in the parameter data.</param>
-        <summary>Updates the designated column using the given &lt;code&gt;Reader&lt;/code&gt;
+        <summary>Updates the designated column using the given <c>Reader</c>
             object, which is the given number of characters long.</summary>
         <remarks>
           <para>
@@ -7428,7 +7449,7 @@
         <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <param name="reader">An object that contains the data to set the parameter value to.</param>
         <param name="length">the number of characters in the parameter data.</param>
-        <summary>Updates the designated column using the given &lt;code&gt;Reader&lt;/code&gt;
+        <summary>Updates the designated column using the given <c>Reader</c>
             object, which is the given number of characters long.</summary>
         <remarks>
           <para>
@@ -7472,7 +7493,7 @@
       <Docs>
         <param name="columnIndex">the first column is 1, the second 2, ...</param>
         <param name="nString">the value for the column to be updated</param>
-        <summary>Updates the designated column with a &lt;code&gt;String&lt;/code&gt; value.</summary>
+        <summary>Updates the designated column with a <c>String</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -7515,7 +7536,7 @@
       <Docs>
         <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <param name="nString">the value for the column to be updated</param>
-        <summary>Updates the designated column with a &lt;code&gt;String&lt;/code&gt; value.</summary>
+        <summary>Updates the designated column with a <c>String</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -7556,7 +7577,7 @@
       </Parameters>
       <Docs>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
-        <summary>Updates the designated column with a &lt;code&gt;null&lt;/code&gt; value.</summary>
+        <summary>Updates the designated column with a <c>null</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -7598,7 +7619,7 @@
       </Parameters>
       <Docs>
         <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
-        <summary>Updates the designated column with a &lt;code&gt;null&lt;/code&gt; value.</summary>
+        <summary>Updates the designated column with a <c>null</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -7642,7 +7663,7 @@
       <Docs>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
         <param name="x">the new column value</param>
-        <summary>Updates the designated column with an &lt;code&gt;Object&lt;/code&gt; value.</summary>
+        <summary>Updates the designated column with an <c>Object</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -7686,7 +7707,7 @@
       <Docs>
         <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <param name="x">the new column value</param>
-        <summary>Updates the designated column with an &lt;code&gt;Object&lt;/code&gt; value.</summary>
+        <summary>Updates the designated column with an <c>Object</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -7731,13 +7752,13 @@
       <Docs>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
         <param name="x">the new column value</param>
-        <param name="scaleOrLength">for an object of &lt;code&gt;java.math.BigDecimal&lt;/code&gt; ,
+        <param name="scaleOrLength">for an object of <c>java.math.BigDecimal</c> ,
                      this is the number of digits after the decimal point. For
-                     Java Object types &lt;code&gt;InputStream&lt;/code&gt; and &lt;code&gt;Reader&lt;/code&gt;,
+                     Java Object types <c>InputStream</c> and <c>Reader</c>,
                      this is the length
                      of the data in the stream or reader.  For all other types,
                      this value will be ignored.</param>
-        <summary>Updates the designated column with an &lt;code&gt;Object&lt;/code&gt; value.</summary>
+        <summary>Updates the designated column with an <c>Object</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -7782,13 +7803,13 @@
       <Docs>
         <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <param name="x">the new column value</param>
-        <param name="scaleOrLength">for an object of &lt;code&gt;java.math.BigDecimal&lt;/code&gt; ,
+        <param name="scaleOrLength">for an object of <c>java.math.BigDecimal</c> ,
                      this is the number of digits after the decimal point. For
-                     Java Object types &lt;code&gt;InputStream&lt;/code&gt; and &lt;code&gt;Reader&lt;/code&gt;,
+                     Java Object types <c>InputStream</c> and <c>Reader</c>,
                      this is the length
                      of the data in the stream or reader.  For all other types,
                      this value will be ignored.</param>
-        <summary>Updates the designated column with an &lt;code&gt;Object&lt;/code&gt; value.</summary>
+        <summary>Updates the designated column with an <c>Object</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -7832,7 +7853,7 @@
       <Docs>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
         <param name="x">the new column value</param>
-        <summary>Updates the designated column with a &lt;code&gt;java.</summary>
+        <summary>Updates the designated column with a <c>java.sql.Ref</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -7876,7 +7897,7 @@
       <Docs>
         <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <param name="x">the new column value</param>
-        <summary>Updates the designated column with a &lt;code&gt;java.</summary>
+        <summary>Updates the designated column with a <c>java.sql.Ref</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -7916,7 +7937,7 @@
       <Parameters />
       <Docs>
         <summary>Updates the underlying database with the new contents of the
-            current row of this &lt;code&gt;ResultSet&lt;/code&gt; object.</summary>
+            current row of this <c>ResultSet</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -7960,7 +7981,7 @@
       <Docs>
         <param name="columnIndex">the first column is 1, the second 2, ...</param>
         <param name="x">the column value</param>
-        <summary>Updates the designated column with a &lt;code&gt;RowId&lt;/code&gt; value.</summary>
+        <summary>Updates the designated column with a <c>RowId</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -8003,7 +8024,7 @@
       <Docs>
         <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <param name="x">the column value</param>
-        <summary>Updates the designated column with a &lt;code&gt;RowId&lt;/code&gt; value.</summary>
+        <summary>Updates the designated column with a <c>RowId</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -8046,7 +8067,7 @@
       <Docs>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
         <param name="x">the new column value</param>
-        <summary>Updates the designated column with a &lt;code&gt;short&lt;/code&gt; value.</summary>
+        <summary>Updates the designated column with a <c>short</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -8090,7 +8111,7 @@
       <Docs>
         <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <param name="x">the new column value</param>
-        <summary>Updates the designated column with a &lt;code&gt;short&lt;/code&gt; value.</summary>
+        <summary>Updates the designated column with a <c>short</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -8134,7 +8155,7 @@
       <Docs>
         <param name="columnIndex">the first column is 1, the second 2, ...</param>
         <param name="xmlObject">the value for the column to be updated</param>
-        <summary>Updates the designated column with a &lt;code&gt;java.</summary>
+        <summary>Updates the designated column with a <c>java.sql.SQLXML</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -8177,7 +8198,7 @@
       <Docs>
         <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <param name="xmlObject">the column value</param>
-        <summary>Updates the designated column with a &lt;code&gt;java.</summary>
+        <summary>Updates the designated column with a <c>java.sql.SQLXML</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -8220,7 +8241,7 @@
       <Docs>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
         <param name="x">the new column value</param>
-        <summary>Updates the designated column with a &lt;code&gt;String&lt;/code&gt; value.</summary>
+        <summary>Updates the designated column with a <c>String</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -8264,7 +8285,7 @@
       <Docs>
         <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <param name="x">the new column value</param>
-        <summary>Updates the designated column with a &lt;code&gt;String&lt;/code&gt; value.</summary>
+        <summary>Updates the designated column with a <c>String</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -8308,7 +8329,7 @@
       <Docs>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
         <param name="x">the new column value</param>
-        <summary>Updates the designated column with a &lt;code&gt;java.</summary>
+        <summary>Updates the designated column with a <c>java.sql.Time</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -8352,7 +8373,7 @@
       <Docs>
         <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <param name="x">the new column value</param>
-        <summary>Updates the designated column with a &lt;code&gt;java.</summary>
+        <summary>Updates the designated column with a <c>java.sql.Time</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -8396,7 +8417,8 @@
       <Docs>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
         <param name="x">the new column value</param>
-        <summary>Updates the designated column with a &lt;code&gt;java.</summary>
+        <summary>Updates the designated column with a <c>java.sql.Timestamp</c>
+            value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -8440,7 +8462,8 @@
       <Docs>
         <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <param name="x">the new column value</param>
-        <summary>Updates the designated column with a &lt;code&gt;java.</summary>
+        <summary>Updates the designated column with a <c>java.sql.Timestamp</c>
+            value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -8510,9 +8533,10 @@
       <Parameters />
       <Docs>
         <summary>Reports whether
-            the last column read had a value of SQL &lt;code&gt;NULL&lt;/code&gt;.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if the last column value read was SQL
-                    &lt;code&gt;NULL&lt;/code&gt; and &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+            the last column read had a value of SQL <c>NULL</c>.</summary>
+        <returns>
+          <c>true</c> if the last column value read was SQL
+                    <c>NULL</c> and <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.Sql/IResultSetMetaData.xml b/docs/Mono.Android/en/Java.Sql/IResultSetMetaData.xml
index 1ec71cd552..979d5ad795 100644
--- a/docs/Mono.Android/en/Java.Sql/IResultSetMetaData.xml
+++ b/docs/Mono.Android/en/Java.Sql/IResultSetMetaData.xml
@@ -29,7 +29,7 @@
   </Attributes>
   <Docs since="1">
     <summary>An object that can be used to get information about the types
-            and properties of the columns in a &lt;code&gt;ResultSet&lt;/code&gt; object.</summary>
+            and properties of the columns in a <c>ResultSet</c> object.</summary>
     <remarks>
       <para>
         <format type="text/html">
@@ -97,7 +97,7 @@
       <MemberValue>0</MemberValue>
       <Docs>
         <summary>The constant indicating that a
-            column does not allow &lt;code&gt;NULL&lt;/code&gt; values.</summary>
+            column does not allow <c>NULL</c> values.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -134,7 +134,7 @@
       <MemberValue>1</MemberValue>
       <Docs>
         <summary>The constant indicating that a
-            column allows &lt;code&gt;NULL&lt;/code&gt; values.</summary>
+            column allows <c>NULL</c> values.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -255,10 +255,12 @@
       <Docs>
         <param name="column">the first column is 1, the second is 2, ...</param>
         <summary>Returns the fully-qualified name of the Java class whose instances
-            are manufactured if the method &lt;code&gt;ResultSet.</summary>
+            are manufactured if the method <c>ResultSet.getObject</c>
+            is called to retrieve a value
+            from the column.</summary>
         <returns>the fully-qualified name of the class in the Java programming
                     language that would be used by the method
-            &lt;code&gt;ResultSet.getObject&lt;/code&gt; to retrieve the value in the specified
+            <c>ResultSet.getObject</c> to retrieve the value in the specified
             column. This is the class name used for custom mapping.</returns>
         <remarks>
           <para>
@@ -691,7 +693,8 @@
       <Docs>
         <param name="column">the first column is 1, the second is 2, ...</param>
         <summary>Indicates whether the designated column is automatically numbered.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -734,7 +737,8 @@
       <Docs>
         <param name="column">the first column is 1, the second is 2, ...</param>
         <summary>Indicates whether a column's case matters.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -777,7 +781,8 @@
       <Docs>
         <param name="column">the first column is 1, the second is 2, ...</param>
         <summary>Indicates whether the designated column is a cash value.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -820,7 +825,8 @@
       <Docs>
         <param name="column">the first column is 1, the second is 2, ...</param>
         <summary>Indicates whether a write on the designated column will definitely succeed.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -863,8 +869,8 @@
       <Docs>
         <param name="column">the first column is 1, the second is 2, ...</param>
         <summary>Indicates the nullability of values in the designated column.</summary>
-        <returns>the nullability status of the given column; one of &lt;code&gt;columnNoNulls&lt;/code&gt;,
-                     &lt;code&gt;columnNullable&lt;/code&gt; or &lt;code&gt;columnNullableUnknown&lt;/code&gt;</returns>
+        <returns>the nullability status of the given column; one of <c>columnNoNulls</c>,
+                     <c>columnNullable</c> or <c>columnNullableUnknown</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -907,7 +913,8 @@
       <Docs>
         <param name="column">the first column is 1, the second is 2, ...</param>
         <summary>Indicates whether the designated column is definitely not writable.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -950,7 +957,8 @@
       <Docs>
         <param name="column">the first column is 1, the second is 2, ...</param>
         <summary>Indicates whether the designated column can be used in a where clause.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -993,7 +1001,8 @@
       <Docs>
         <param name="column">the first column is 1, the second is 2, ...</param>
         <summary>Indicates whether values in the designated column are signed numbers.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1036,7 +1045,8 @@
       <Docs>
         <param name="column">the first column is 1, the second is 2, ...</param>
         <summary>Indicates whether it is possible for a write on the designated column to succeed.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <returns>
+          <c>true</c> if so; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.Sql/IRowId.xml b/docs/Mono.Android/en/Java.Sql/IRowId.xml
index 5713676af4..e759c052c5 100644
--- a/docs/Mono.Android/en/Java.Sql/IRowId.xml
+++ b/docs/Mono.Android/en/Java.Sql/IRowId.xml
@@ -65,10 +65,10 @@
         <Parameter Name="obj" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="obj">the &lt;code&gt;Object&lt;/code&gt; to compare this &lt;code&gt;RowId&lt;/code&gt; object
+        <param name="obj">the <c>Object</c> to compare this <c>RowId</c> object
                 against.</param>
-        <summary>Compares this &lt;code&gt;RowId&lt;/code&gt; to the specified object.</summary>
-        <returns>true if the &lt;code&gt;RowId&lt;/code&gt;s are equal; false otherwise</returns>
+        <summary>Compares this <c>RowId</c> to the specified object.</summary>
+        <returns>true if the <c>RowId</c>s are equal; false otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -105,8 +105,8 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Returns an array of bytes representing the value of the SQL &lt;code&gt;ROWID&lt;/code&gt;
-            designated by this &lt;code&gt;java.</summary>
+        <summary>Returns an array of bytes representing the value of the SQL <c>ROWID</c>
+            designated by this <c>java.sql.RowId</c> object.</summary>
         <returns>an array of bytes, whose length is determined by the driver supplying
                 the connection, representing the value of the ROWID designated by this
                 java.sql.RowId object.</returns>
@@ -146,8 +146,8 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Returns a hash code value of this &lt;code&gt;RowId&lt;/code&gt; object.</summary>
-        <returns>a hash code for the &lt;code&gt;RowId&lt;/code&gt;</returns>
+        <summary>Returns a hash code value of this <c>RowId</c> object.</summary>
+        <returns>a hash code for the <c>RowId</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -185,10 +185,10 @@
       <Parameters />
       <Docs>
         <summary>Returns a String representing the value of the SQL ROWID designated by this
-            &lt;code&gt;java.</summary>
+            <c>java.sql.RowId</c> object.</summary>
         <returns>a String whose format is determined by the driver supplying the
-                connection, representing the value of the &lt;code&gt;ROWID&lt;/code&gt; designated
-                by this &lt;code&gt;java.sql.RowId&lt;/code&gt;  object.</returns>
+                connection, representing the value of the <c>ROWID</c> designated
+                by this <c>java.sql.RowId</c>  object.</returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.Sql/ISQLData.xml b/docs/Mono.Android/en/Java.Sql/ISQLData.xml
index 9c2a1d9656..bf98ea8835 100644
--- a/docs/Mono.Android/en/Java.Sql/ISQLData.xml
+++ b/docs/Mono.Android/en/Java.Sql/ISQLData.xml
@@ -66,7 +66,7 @@
         <Parameter Name="typeName" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="stream">the &lt;code&gt;SQLInput&lt;/code&gt; object from which to read the data for
+        <param name="stream">the <c>SQLInput</c> object from which to read the data for
             the value that is being custom mapped</param>
         <param name="typeName">the SQL type name of the value on the data stream</param>
         <summary>Populates this object with data read from the database.</summary>
@@ -141,7 +141,7 @@
         <Parameter Name="stream" Type="Java.Sql.ISQLOutput" />
       </Parameters>
       <Docs>
-        <param name="stream">the &lt;code&gt;SQLOutput&lt;/code&gt; object to which to write the data for
+        <param name="stream">the <c>SQLOutput</c> object to which to write the data for
             the value that was custom mapped</param>
         <summary>Writes this object to the given SQL data stream, converting it back to
             its SQL value in the data source.</summary>
diff --git a/docs/Mono.Android/en/Java.Sql/ISQLInput.xml b/docs/Mono.Android/en/Java.Sql/ISQLInput.xml
index 57f579c80e..5549b09c10 100644
--- a/docs/Mono.Android/en/Java.Sql/ISQLInput.xml
+++ b/docs/Mono.Android/en/Java.Sql/ISQLInput.xml
@@ -63,11 +63,11 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Reads an SQL &lt;code&gt;ARRAY&lt;/code&gt; value from the stream and returns it as an
-            &lt;code&gt;Array&lt;/code&gt; object in the Java programming language.</summary>
-        <returns>an &lt;code&gt;Array&lt;/code&gt; object representing data of the SQL
-            &lt;code&gt;ARRAY&lt;/code&gt; value at the head of the stream; &lt;code&gt;null&lt;/code&gt;
-            if the value read is SQL &lt;code&gt;NULL&lt;/code&gt;</returns>
+        <summary>Reads an SQL <c>ARRAY</c> value from the stream and returns it as an
+            <c>Array</c> object in the Java programming language.</summary>
+        <returns>an <c>Array</c> object representing data of the SQL
+            <c>ARRAY</c> value at the head of the stream; <c>null</c>
+            if the value read is SQL <c>NULL</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -107,7 +107,7 @@
       <Parameters />
       <Docs>
         <summary>Reads the next attribute in the stream and returns it as a stream of ASCII characters.</summary>
-        <returns>the attribute; if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, returns &lt;code&gt;null&lt;/code&gt;</returns>
+        <returns>the attribute; if the value is SQL <c>NULL</c>, returns <c>null</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -146,8 +146,9 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Reads the next attribute in the stream and returns it as a &lt;code&gt;java.</summary>
-        <returns>the attribute; if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, returns &lt;code&gt;null&lt;/code&gt;</returns>
+        <summary>Reads the next attribute in the stream and returns it as a <c>java.math.BigDecimal</c>
+            object in the Java programming language.</summary>
+        <returns>the attribute; if the value is SQL <c>NULL</c>, returns <c>null</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -188,7 +189,7 @@
       <Docs>
         <summary>Reads the next attribute in the stream and returns it as a stream of uninterpreted
             bytes.</summary>
-        <returns>the attribute; if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, returns &lt;code&gt;null&lt;/code&gt;</returns>
+        <returns>the attribute; if the value is SQL <c>NULL</c>, returns <c>null</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -227,11 +228,11 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Reads an SQL &lt;code&gt;BLOB&lt;/code&gt; value from the stream and returns it as a
-            &lt;code&gt;Blob&lt;/code&gt; object in the Java programming language.</summary>
-        <returns>a &lt;code&gt;Blob&lt;/code&gt; object representing data of the SQL &lt;code&gt;BLOB&lt;/code&gt; value
-            at the head of the stream; &lt;code&gt;null&lt;/code&gt; if the value read is
-            SQL &lt;code&gt;NULL&lt;/code&gt;</returns>
+        <summary>Reads an SQL <c>BLOB</c> value from the stream and returns it as a
+            <c>Blob</c> object in the Java programming language.</summary>
+        <returns>a <c>Blob</c> object representing data of the SQL <c>BLOB</c> value
+            at the head of the stream; <c>null</c> if the value read is
+            SQL <c>NULL</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -270,9 +271,9 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Reads the next attribute in the stream and returns it as a &lt;code&gt;boolean&lt;/code&gt;
+        <summary>Reads the next attribute in the stream and returns it as a <c>boolean</c>
             in the Java programming language.</summary>
-        <returns>the attribute; if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, returns &lt;code&gt;false&lt;/code&gt;</returns>
+        <returns>the attribute; if the value is SQL <c>NULL</c>, returns <c>false</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -311,9 +312,9 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Reads the next attribute in the stream and returns it as a &lt;code&gt;byte&lt;/code&gt;
+        <summary>Reads the next attribute in the stream and returns it as a <c>byte</c>
             in the Java programming language.</summary>
-        <returns>the attribute; if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, returns &lt;code&gt;0&lt;/code&gt;</returns>
+        <returns>the attribute; if the value is SQL <c>NULL</c>, returns <c>0</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -354,7 +355,7 @@
       <Docs>
         <summary>Reads the next attribute in the stream and returns it as an array of bytes
             in the Java programming language.</summary>
-        <returns>the attribute; if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, returns &lt;code&gt;null&lt;/code&gt;</returns>
+        <returns>the attribute; if the value is SQL <c>NULL</c>, returns <c>null</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -394,7 +395,7 @@
       <Parameters />
       <Docs>
         <summary>Reads the next attribute in the stream and returns it as a stream of Unicode characters.</summary>
-        <returns>the attribute; if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, returns &lt;code&gt;null&lt;/code&gt;</returns>
+        <returns>the attribute; if the value is SQL <c>NULL</c>, returns <c>null</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -433,11 +434,11 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Reads an SQL &lt;code&gt;CLOB&lt;/code&gt; value from the stream and returns it as a
-            &lt;code&gt;Clob&lt;/code&gt; object in the Java programming language.</summary>
-        <returns>a &lt;code&gt;Clob&lt;/code&gt; object representing data of the SQL &lt;code&gt;CLOB&lt;/code&gt; value
-            at the head of the stream; &lt;code&gt;null&lt;/code&gt; if the value read is
-            SQL &lt;code&gt;NULL&lt;/code&gt;</returns>
+        <summary>Reads an SQL <c>CLOB</c> value from the stream and returns it as a
+            <c>Clob</c> object in the Java programming language.</summary>
+        <returns>a <c>Clob</c> object representing data of the SQL <c>CLOB</c> value
+            at the head of the stream; <c>null</c> if the value read is
+            SQL <c>NULL</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -476,8 +477,8 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Reads the next attribute in the stream and returns it as a &lt;code&gt;java.</summary>
-        <returns>the attribute; if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, returns &lt;code&gt;null&lt;/code&gt;</returns>
+        <summary>Reads the next attribute in the stream and returns it as a <c>java.sql.Date</c> object.</summary>
+        <returns>the attribute; if the value is SQL <c>NULL</c>, returns <c>null</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -516,9 +517,9 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Reads the next attribute in the stream and returns it as a &lt;code&gt;double&lt;/code&gt;
+        <summary>Reads the next attribute in the stream and returns it as a <c>double</c>
             in the Java programming language.</summary>
-        <returns>the attribute; if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, returns &lt;code&gt;0&lt;/code&gt;</returns>
+        <returns>the attribute; if the value is SQL <c>NULL</c>, returns <c>0</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -557,9 +558,9 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Reads the next attribute in the stream and returns it as a &lt;code&gt;float&lt;/code&gt;
+        <summary>Reads the next attribute in the stream and returns it as a <c>float</c>
             in the Java programming language.</summary>
-        <returns>the attribute; if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, returns &lt;code&gt;0&lt;/code&gt;</returns>
+        <returns>the attribute; if the value is SQL <c>NULL</c>, returns <c>0</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -598,9 +599,9 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Reads the next attribute in the stream and returns it as an &lt;code&gt;int&lt;/code&gt;
+        <summary>Reads the next attribute in the stream and returns it as an <c>int</c>
             in the Java programming language.</summary>
-        <returns>the attribute; if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, returns &lt;code&gt;0&lt;/code&gt;</returns>
+        <returns>the attribute; if the value is SQL <c>NULL</c>, returns <c>0</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -639,9 +640,9 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Reads the next attribute in the stream and returns it as a &lt;code&gt;long&lt;/code&gt;
+        <summary>Reads the next attribute in the stream and returns it as a <c>long</c>
             in the Java programming language.</summary>
-        <returns>the attribute; if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, returns &lt;code&gt;0&lt;/code&gt;</returns>
+        <returns>the attribute; if the value is SQL <c>NULL</c>, returns <c>0</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -680,11 +681,11 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Reads an SQL &lt;code&gt;NCLOB&lt;/code&gt; value from the stream and returns it as a
-            &lt;code&gt;NClob&lt;/code&gt; object in the Java programming language.</summary>
-        <returns>a &lt;code&gt;NClob&lt;/code&gt; object representing data of the SQL &lt;code&gt;NCLOB&lt;/code&gt; value
-            at the head of the stream; &lt;code&gt;null&lt;/code&gt; if the value read is
-            SQL &lt;code&gt;NULL&lt;/code&gt;</returns>
+        <summary>Reads an SQL <c>NCLOB</c> value from the stream and returns it as a
+            <c>NClob</c> object in the Java programming language.</summary>
+        <returns>a <c>NClob</c> object representing data of the SQL <c>NCLOB</c> value
+            at the head of the stream; <c>null</c> if the value read is
+            SQL <c>NULL</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -723,9 +724,9 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Reads the next attribute in the stream and returns it as a &lt;code&gt;String&lt;/code&gt;
+        <summary>Reads the next attribute in the stream and returns it as a <c>String</c>
             in the Java programming language.</summary>
-        <returns>the attribute; if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, returns &lt;code&gt;null&lt;/code&gt;</returns>
+        <returns>the attribute; if the value is SQL <c>NULL</c>, returns <c>null</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -765,9 +766,9 @@
       <Parameters />
       <Docs>
         <summary>Reads the datum at the head of the stream and returns it as an
-            &lt;code&gt;Object&lt;/code&gt; in the Java programming language.</summary>
-        <returns>the datum at the head of the stream as an &lt;code&gt;Object&lt;/code&gt; in the
-            Java programming language;&lt;code&gt;null&lt;/code&gt; if the datum is SQL &lt;code&gt;NULL&lt;/code&gt;</returns>
+            <c>Object</c> in the Java programming language.</summary>
+        <returns>the datum at the head of the stream as an <c>Object</c> in the
+            Java programming language;<c>null</c> if the datum is SQL <c>NULL</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -806,11 +807,11 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Reads an SQL &lt;code&gt;REF&lt;/code&gt; value from the stream and returns it as a
-            &lt;code&gt;Ref&lt;/code&gt; object in the Java programming language.</summary>
-        <returns>a &lt;code&gt;Ref&lt;/code&gt; object representing the SQL &lt;code&gt;REF&lt;/code&gt; value
-            at the head of the stream; &lt;code&gt;null&lt;/code&gt; if the value read is
-            SQL &lt;code&gt;NULL&lt;/code&gt;</returns>
+        <summary>Reads an SQL <c>REF</c> value from the stream and returns it as a
+            <c>Ref</c> object in the Java programming language.</summary>
+        <returns>a <c>Ref</c> object representing the SQL <c>REF</c> value
+            at the head of the stream; <c>null</c> if the value read is
+            SQL <c>NULL</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -849,11 +850,11 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Reads an SQL &lt;code&gt;ROWID&lt;/code&gt; value from the stream and returns it as a
-            &lt;code&gt;RowId&lt;/code&gt; object in the Java programming language.</summary>
-        <returns>a &lt;code&gt;RowId&lt;/code&gt; object representing data of the SQL &lt;code&gt;ROWID&lt;/code&gt; value
-            at the head of the stream; &lt;code&gt;null&lt;/code&gt; if the value read is
-            SQL &lt;code&gt;NULL&lt;/code&gt;</returns>
+        <summary>Reads an SQL <c>ROWID</c> value from the stream and returns it as a
+            <c>RowId</c> object in the Java programming language.</summary>
+        <returns>a <c>RowId</c> object representing data of the SQL <c>ROWID</c> value
+            at the head of the stream; <c>null</c> if the value read is
+            SQL <c>NULL</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -892,9 +893,9 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Reads the next attribute in the stream and returns it as a &lt;code&gt;short&lt;/code&gt;
+        <summary>Reads the next attribute in the stream and returns it as a <c>short</c>
             in the Java programming language.</summary>
-        <returns>the attribute; if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, returns &lt;code&gt;0&lt;/code&gt;</returns>
+        <returns>the attribute; if the value is SQL <c>NULL</c>, returns <c>0</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -933,11 +934,11 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Reads an SQL &lt;code&gt;XML&lt;/code&gt; value from the stream and returns it as a
-            &lt;code&gt;SQLXML&lt;/code&gt; object in the Java programming language.</summary>
-        <returns>a &lt;code&gt;SQLXML&lt;/code&gt; object representing data of the SQL &lt;code&gt;XML&lt;/code&gt; value
-            at the head of the stream; &lt;code&gt;null&lt;/code&gt; if the value read is
-            SQL &lt;code&gt;NULL&lt;/code&gt;</returns>
+        <summary>Reads an SQL <c>XML</c> value from the stream and returns it as a
+            <c>SQLXML</c> object in the Java programming language.</summary>
+        <returns>a <c>SQLXML</c> object representing data of the SQL <c>XML</c> value
+            at the head of the stream; <c>null</c> if the value read is
+            SQL <c>NULL</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -976,9 +977,9 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Reads the next attribute in the stream and returns it as a &lt;code&gt;String&lt;/code&gt;
+        <summary>Reads the next attribute in the stream and returns it as a <c>String</c>
             in the Java programming language.</summary>
-        <returns>the attribute; if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, returns &lt;code&gt;null&lt;/code&gt;</returns>
+        <returns>the attribute; if the value is SQL <c>NULL</c>, returns <c>null</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1017,8 +1018,8 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Reads the next attribute in the stream and returns it as a &lt;code&gt;java.</summary>
-        <returns>the attribute; if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, returns &lt;code&gt;null&lt;/code&gt;</returns>
+        <summary>Reads the next attribute in the stream and returns it as a <c>java.sql.Time</c> object.</summary>
+        <returns>the attribute; if the value is SQL <c>NULL</c>, returns <c>null</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1057,8 +1058,8 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Reads the next attribute in the stream and returns it as a &lt;code&gt;java.</summary>
-        <returns>the attribute; if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, returns &lt;code&gt;null&lt;/code&gt;</returns>
+        <summary>Reads the next attribute in the stream and returns it as a <c>java.sql.Timestamp</c> object.</summary>
+        <returns>the attribute; if the value is SQL <c>NULL</c>, returns <c>null</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1097,9 +1098,9 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Reads an SQL &lt;code&gt;DATALINK&lt;/code&gt; value from the stream and returns it as a
-            &lt;code&gt;java.</summary>
-        <returns>a &lt;code&gt;java.net.URL&lt;/code&gt; object.</returns>
+        <summary>Reads an SQL <c>DATALINK</c> value from the stream and returns it as a
+            <c>java.net.URL</c> object in the Java programming language.</summary>
+        <returns>a <c>java.net.URL</c> object.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1138,9 +1139,10 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Retrieves whether the last value read was SQL &lt;code&gt;NULL&lt;/code&gt;.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if the most recently read SQL value was SQL
-            &lt;code&gt;NULL&lt;/code&gt;; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <summary>Retrieves whether the last value read was SQL <c>NULL</c>.</summary>
+        <returns>
+          <c>true</c> if the most recently read SQL value was SQL
+            <c>NULL</c>; <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.Sql/ISQLOutput.xml b/docs/Mono.Android/en/Java.Sql/ISQLOutput.xml
index 3d95ca20a0..51d0e6d52b 100644
--- a/docs/Mono.Android/en/Java.Sql/ISQLOutput.xml
+++ b/docs/Mono.Android/en/Java.Sql/ISQLOutput.xml
@@ -65,9 +65,9 @@
         <Parameter Name="x" Type="Java.Sql.IArray" />
       </Parameters>
       <Docs>
-        <param name="x">an &lt;code&gt;Array&lt;/code&gt; object representing data of an SQL
-            &lt;code&gt;ARRAY&lt;/code&gt; type</param>
-        <summary>Writes an SQL &lt;code&gt;ARRAY&lt;/code&gt; value to the stream.</summary>
+        <param name="x">an <c>Array</c> object representing data of an SQL
+            <c>ARRAY</c> type</param>
+        <summary>Writes an SQL <c>ARRAY</c> value to the stream.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -235,9 +235,9 @@
         <Parameter Name="x" Type="Java.Sql.IBlob" />
       </Parameters>
       <Docs>
-        <param name="x">a &lt;code&gt;Blob&lt;/code&gt; object representing data of an SQL
-            &lt;code&gt;BLOB&lt;/code&gt; value</param>
-        <summary>Writes an SQL &lt;code&gt;BLOB&lt;/code&gt; value to the stream.</summary>
+        <param name="x">a <c>Blob</c> object representing data of an SQL
+            <c>BLOB</c> value</param>
+        <summary>Writes an SQL <c>BLOB</c> value to the stream.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -446,9 +446,9 @@
         <Parameter Name="x" Type="Java.Sql.IClob" />
       </Parameters>
       <Docs>
-        <param name="x">a &lt;code&gt;Clob&lt;/code&gt; object representing data of an SQL
-            &lt;code&gt;CLOB&lt;/code&gt; value</param>
-        <summary>Writes an SQL &lt;code&gt;CLOB&lt;/code&gt; value to the stream.</summary>
+        <param name="x">a <c>Clob</c> object representing data of an SQL
+            <c>CLOB</c> value</param>
+        <summary>Writes an SQL <c>CLOB</c> value to the stream.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -699,9 +699,9 @@
         <Parameter Name="x" Type="Java.Sql.INClob" />
       </Parameters>
       <Docs>
-        <param name="x">a &lt;code&gt;NClob&lt;/code&gt; object representing data of an SQL
-            &lt;code&gt;NCLOB&lt;/code&gt; value</param>
-        <summary>Writes an SQL &lt;code&gt;NCLOB&lt;/code&gt; value to the stream.</summary>
+        <param name="x">a <c>NClob</c> object representing data of an SQL
+            <c>NCLOB</c> value</param>
+        <summary>Writes an SQL <c>NCLOB</c> value to the stream.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -743,7 +743,7 @@
       </Parameters>
       <Docs>
         <param name="x">the value to pass to the database</param>
-        <summary>Writes the next attribute to the stream as a &lt;code&gt;String&lt;/code&gt;
+        <summary>Writes the next attribute to the stream as a <c>String</c>
             in the Java programming language.</summary>
         <remarks>
           <para>
@@ -788,7 +788,7 @@
         <param name="x">the object representing data of an SQL structured or
             distinct type</param>
         <summary>Writes to the stream the data contained in the given
-            &lt;code&gt;SQLData&lt;/code&gt; object.</summary>
+            <c>SQLData</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -829,9 +829,9 @@
         <Parameter Name="x" Type="Java.Sql.IRef" />
       </Parameters>
       <Docs>
-        <param name="x">a &lt;code&gt;Ref&lt;/code&gt; object representing data of an SQL
-            &lt;code&gt;REF&lt;/code&gt; value</param>
-        <summary>Writes an SQL &lt;code&gt;REF&lt;/code&gt; value to the stream.</summary>
+        <param name="x">a <c>Ref</c> object representing data of an SQL
+            <c>REF</c> value</param>
+        <summary>Writes an SQL <c>REF</c> value to the stream.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -872,9 +872,9 @@
         <Parameter Name="x" Type="Java.Sql.IRowId" />
       </Parameters>
       <Docs>
-        <param name="x">a &lt;code&gt;RowId&lt;/code&gt; object representing data of an SQL
-            &lt;code&gt;ROWID&lt;/code&gt; value</param>
-        <summary>Writes an SQL &lt;code&gt;ROWID&lt;/code&gt; value to the stream.</summary>
+        <param name="x">a <c>RowId</c> object representing data of an SQL
+            <c>ROWID</c> value</param>
+        <summary>Writes an SQL <c>ROWID</c> value to the stream.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -957,9 +957,9 @@
         <Parameter Name="x" Type="Java.Sql.ISQLXML" />
       </Parameters>
       <Docs>
-        <param name="x">a &lt;code&gt;SQLXML&lt;/code&gt; object representing data of an SQL
-            &lt;code&gt;XML&lt;/code&gt; value</param>
-        <summary>Writes an SQL &lt;code&gt;XML&lt;/code&gt; value to the stream.</summary>
+        <param name="x">a <c>SQLXML</c> object representing data of an SQL
+            <c>XML</c> value</param>
+        <summary>Writes an SQL <c>XML</c> value to the stream.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -1001,7 +1001,7 @@
       </Parameters>
       <Docs>
         <param name="x">the value to pass to the database</param>
-        <summary>Writes the next attribute to the stream as a &lt;code&gt;String&lt;/code&gt;
+        <summary>Writes the next attribute to the stream as a <c>String</c>
             in the Java programming language.</summary>
         <remarks>
           <para>
@@ -1043,7 +1043,7 @@
         <Parameter Name="x" Type="Java.Sql.IStruct" />
       </Parameters>
       <Docs>
-        <param name="x">a &lt;code&gt;Struct&lt;/code&gt; object representing data of an SQL
+        <param name="x">a <c>Struct</c> object representing data of an SQL
             structured type</param>
         <summary>Writes an SQL structured type value to the stream.</summary>
         <remarks>
@@ -1170,9 +1170,9 @@
         <Parameter Name="x" Type="Java.Net.URL" />
       </Parameters>
       <Docs>
-        <param name="x">a &lt;code&gt;java.net.URL&lt;/code&gt; object representing the data
+        <param name="x">a <c>java.net.URL</c> object representing the data
             of SQL DATALINK type</param>
-        <summary>Writes a SQL &lt;code&gt;DATALINK&lt;/code&gt; value to the stream.</summary>
+        <summary>Writes a SQL <c>DATALINK</c> value to the stream.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.Sql/ISavepoint.xml b/docs/Mono.Android/en/Java.Sql/ISavepoint.xml
index 15b3152845..1137989289 100644
--- a/docs/Mono.Android/en/Java.Sql/ISavepoint.xml
+++ b/docs/Mono.Android/en/Java.Sql/ISavepoint.xml
@@ -27,7 +27,7 @@
   <Docs since="1">
     <summary>The representation of a savepoint, which is a point within
             the current transaction that can be referenced from the
-            &lt;code&gt;Connection.</summary>
+            <c>Connection.rollback</c> method.</summary>
     <remarks>
       <para>
         <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.Sql/IStatement.xml b/docs/Mono.Android/en/Java.Sql/IStatement.xml
index 891c2055cc..9dcc5e1cf0 100644
--- a/docs/Mono.Android/en/Java.Sql/IStatement.xml
+++ b/docs/Mono.Android/en/Java.Sql/IStatement.xml
@@ -68,10 +68,10 @@
         <Parameter Name="sql" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="sql">typically this is a SQL &lt;code&gt;INSERT&lt;/code&gt; or
-            &lt;code&gt;UPDATE&lt;/code&gt; statement</param>
+        <param name="sql">typically this is a SQL <c>INSERT</c> or
+            <c>UPDATE</c> statement</param>
         <summary>Adds the given SQL command to the current list of commmands for this
-            &lt;code&gt;Statement&lt;/code&gt; object.</summary>
+            <c>Statement</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -111,7 +111,7 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Cancels this &lt;code&gt;Statement&lt;/code&gt; object if both the DBMS and
+        <summary>Cancels this <c>Statement</c> object if both the DBMS and
             driver support aborting an SQL statement.</summary>
         <remarks>
           <para>
@@ -151,7 +151,7 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Empties this &lt;code&gt;Statement&lt;/code&gt; object's current list of
+        <summary>Empties this <c>Statement</c> object's current list of
             SQL commands.</summary>
         <remarks>
           <para>
@@ -192,7 +192,7 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Clears all the warnings reported on this &lt;code&gt;Statement&lt;/code&gt;
+        <summary>Clears all the warnings reported on this <c>Statement</c>
             object.</summary>
         <remarks>
           <para>
@@ -232,7 +232,7 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Releases this &lt;code&gt;Statement&lt;/code&gt; object's database
+        <summary>Releases this <c>Statement</c> object's database
             and JDBC resources immediately instead of waiting for
             this to happen when it is automatically closed.</summary>
         <remarks>
@@ -273,9 +273,9 @@
       </ReturnValue>
       <MemberValue>3</MemberValue>
       <Docs>
-        <summary>The constant indicating that all &lt;code&gt;ResultSet&lt;/code&gt; objects that
+        <summary>The constant indicating that all <c>ResultSet</c> objects that
             have previously been kept open should be closed when calling
-            &lt;code&gt;getMoreResults&lt;/code&gt;.</summary>
+            <c>getMoreResults</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -311,8 +311,8 @@
       </ReturnValue>
       <MemberValue>1</MemberValue>
       <Docs>
-        <summary>The constant indicating that the current &lt;code&gt;ResultSet&lt;/code&gt; object
-            should be closed when calling &lt;code&gt;getMoreResults&lt;/code&gt;.</summary>
+        <summary>The constant indicating that the current <c>ResultSet</c> object
+            should be closed when calling <c>getMoreResults</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -382,8 +382,9 @@
       <Docs>
         <param name="sql">any SQL statement</param>
         <summary>Executes the given SQL statement, which may return multiple results.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if the first result is a &lt;code&gt;ResultSet&lt;/code&gt;
-                    object; &lt;code&gt;false&lt;/code&gt; if it is an update count or there are
+        <returns>
+          <c>true</c> if the first result is a <c>ResultSet</c>
+                    object; <c>false</c> if it is an update count or there are
                     no results</returns>
         <remarks>
           <para>
@@ -429,15 +430,16 @@
         <param name="sql">any SQL statement</param>
         <param name="autoGeneratedKeys">a constant indicating whether auto-generated
                    keys should be made available for retrieval using the method
-                   &lt;code&gt;getGeneratedKeys&lt;/code&gt;; one of the following constants:
-                   &lt;code&gt;Statement.RETURN_GENERATED_KEYS&lt;/code&gt; or
-                   &lt;code&gt;Statement.NO_GENERATED_KEYS&lt;/code&gt;</param>
+                   <c>getGeneratedKeys</c>; one of the following constants:
+                   <c>Statement.RETURN_GENERATED_KEYS</c> or
+                   <c>Statement.NO_GENERATED_KEYS</c></param>
         <summary>Executes the given SQL statement, which may return multiple results,
             and signals the driver that any
             auto-generated keys should be made available
             for retrieval.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if the first result is a &lt;code&gt;ResultSet&lt;/code&gt;
-                    object; &lt;code&gt;false&lt;/code&gt; if it is an update count or there are
+        <returns>
+          <c>true</c> if the first result is a <c>ResultSet</c>
+                    object; <c>false</c> if it is an update count or there are
                     no results</returns>
         <remarks>
           <para>
@@ -483,13 +485,14 @@
         <param name="sql">any SQL statement</param>
         <param name="columnIndexes">an array of the indexes of the columns in the
                    inserted row that should be  made available for retrieval by a
-                   call to the method &lt;code&gt;getGeneratedKeys&lt;/code&gt;</param>
+                   call to the method <c>getGeneratedKeys</c></param>
         <summary>Executes the given SQL statement, which may return multiple results,
             and signals the driver that the
             auto-generated keys indicated in the given array should be made available
             for retrieval.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if the first result is a &lt;code&gt;ResultSet&lt;/code&gt;
-                    object; &lt;code&gt;false&lt;/code&gt; if it is an update count or there
+        <returns>
+          <c>true</c> if the first result is a <c>ResultSet</c>
+                    object; <c>false</c> if it is an update count or there
                     are no results</returns>
         <remarks>
           <para>
@@ -535,13 +538,14 @@
         <param name="sql">any SQL statement</param>
         <param name="columnNames">an array of the names of the columns in the inserted
                    row that should be made available for retrieval by a call to the
-                   method &lt;code&gt;getGeneratedKeys&lt;/code&gt;</param>
+                   method <c>getGeneratedKeys</c></param>
         <summary>Executes the given SQL statement, which may return multiple results,
             and signals the driver that the
             auto-generated keys indicated in the given array should be made available
             for retrieval.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if the next result is a &lt;code&gt;ResultSet&lt;/code&gt;
-                    object; &lt;code&gt;false&lt;/code&gt; if it is an update count or there
+        <returns>
+          <c>true</c> if the next result is a <c>ResultSet</c>
+                    object; <c>false</c> if it is an update count or there
                     are no more results</returns>
         <remarks>
           <para>
@@ -664,11 +668,11 @@
       </Parameters>
       <Docs>
         <param name="sql">an SQL statement to be sent to the database, typically a
-                   static SQL &lt;code&gt;SELECT&lt;/code&gt; statement</param>
+                   static SQL <c>SELECT</c> statement</param>
         <summary>Executes the given SQL statement, which returns a single
-            &lt;code&gt;ResultSet&lt;/code&gt; object.</summary>
-        <returns>a &lt;code&gt;ResultSet&lt;/code&gt; object that contains the data produced
-                    by the given query; never &lt;code&gt;null&lt;/code&gt;</returns>
+            <c>ResultSet</c> object.</summary>
+        <returns>a <c>ResultSet</c> object that contains the data produced
+                    by the given query; never <c>null</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -710,11 +714,11 @@
         <Parameter Name="sql" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="sql">an SQL Data Manipulation Language (DML) statement, such as &lt;code&gt;INSERT&lt;/code&gt;, &lt;code&gt;UPDATE&lt;/code&gt; or
-            &lt;code&gt;DELETE&lt;/code&gt;; or an SQL statement that returns nothing,
+        <param name="sql">an SQL Data Manipulation Language (DML) statement, such as <c>INSERT</c>, <c>UPDATE</c> or
+            <c>DELETE</c>; or an SQL statement that returns nothing,
             such as a DDL statement.</param>
-        <summary>Executes the given SQL statement, which may be an &lt;code&gt;INSERT&lt;/code&gt;,
-            &lt;code&gt;UPDATE&lt;/code&gt;, or &lt;code&gt;DELETE&lt;/code&gt; statement or an
+        <summary>Executes the given SQL statement, which may be an <c>INSERT</c>,
+            <c>UPDATE</c>, or <c>DELETE</c> statement or an
             SQL statement that returns nothing, such as an SQL DDL statement.</summary>
         <returns>either (1) the row count for SQL Data Manipulation Language (DML) statements
                     or (2) 0 for SQL statements that return nothing</returns>
@@ -760,17 +764,16 @@
         <Parameter Name="autoGeneratedKeys" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="sql">an SQL Data Manipulation Language (DML) statement, such as &lt;code&gt;INSERT&lt;/code&gt;, &lt;code&gt;UPDATE&lt;/code&gt; or
-            &lt;code&gt;DELETE&lt;/code&gt;; or an SQL statement that returns nothing,
+        <param name="sql">an SQL Data Manipulation Language (DML) statement, such as <c>INSERT</c>, <c>UPDATE</c> or
+            <c>DELETE</c>; or an SQL statement that returns nothing,
             such as a DDL statement.</param>
         <param name="autoGeneratedKeys">a flag indicating whether auto-generated keys
                    should be made available for retrieval;
                     one of the following constants:
-                    &lt;code&gt;Statement.RETURN_GENERATED_KEYS&lt;/code&gt;
-                    &lt;code&gt;Statement.NO_GENERATED_KEYS&lt;/code&gt;</param>
+                    <c>Statement.RETURN_GENERATED_KEYS</c><c>Statement.NO_GENERATED_KEYS</c></param>
         <summary>Executes the given SQL statement and signals the driver with the
             given flag about whether the
-            auto-generated keys produced by this &lt;code&gt;Statement&lt;/code&gt; object
+            auto-generated keys produced by this <c>Statement</c> object
             should be made available for retrieval.</summary>
         <returns>either (1) the row count for SQL Data Manipulation Language (DML) statements
                     or (2) 0 for SQL statements that return nothing</returns>
@@ -816,8 +819,8 @@
         <Parameter Name="columnIndexes" Type="System.Int32[]" />
       </Parameters>
       <Docs>
-        <param name="sql">an SQL Data Manipulation Language (DML) statement, such as &lt;code&gt;INSERT&lt;/code&gt;, &lt;code&gt;UPDATE&lt;/code&gt; or
-            &lt;code&gt;DELETE&lt;/code&gt;; or an SQL statement that returns nothing,
+        <param name="sql">an SQL Data Manipulation Language (DML) statement, such as <c>INSERT</c>, <c>UPDATE</c> or
+            <c>DELETE</c>; or an SQL statement that returns nothing,
             such as a DDL statement.</param>
         <param name="columnIndexes">an array of column indexes indicating the columns
                    that should be returned from the inserted row</param>
@@ -868,16 +871,16 @@
         <Parameter Name="columnNames" Type="System.String[]" />
       </Parameters>
       <Docs>
-        <param name="sql">an SQL Data Manipulation Language (DML) statement, such as &lt;code&gt;INSERT&lt;/code&gt;, &lt;code&gt;UPDATE&lt;/code&gt; or
-            &lt;code&gt;DELETE&lt;/code&gt;; or an SQL statement that returns nothing,
+        <param name="sql">an SQL Data Manipulation Language (DML) statement, such as <c>INSERT</c>, <c>UPDATE</c> or
+            <c>DELETE</c>; or an SQL statement that returns nothing,
             such as a DDL statement.</param>
         <param name="columnNames">an array of the names of the columns that should be
                    returned from the inserted row</param>
         <summary>Executes the given SQL statement and signals the driver that the
             auto-generated keys indicated in the given array should be made available
             for retrieval.</summary>
-        <returns>either the row count for &lt;code&gt;INSERT&lt;/code&gt;, &lt;code&gt;UPDATE&lt;/code&gt;,
-                    or &lt;code&gt;DELETE&lt;/code&gt; statements, or 0 for SQL statements
+        <returns>either the row count for <c>INSERT</c>, <c>UPDATE</c>,
+                    or <c>DELETE</c> statements, or 0 for SQL statements
                     that return nothing</returns>
         <remarks>
           <para>
@@ -1026,19 +1029,20 @@
         <Parameter Name="current" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="current">one of the following &lt;code&gt;Statement&lt;/code&gt;
+        <param name="current">one of the following <c>Statement</c>
                    constants indicating what should happen to current
-                   &lt;code&gt;ResultSet&lt;/code&gt; objects obtained using the method
-                   &lt;code&gt;getResultSet&lt;/code&gt;:
-                   &lt;code&gt;Statement.CLOSE_CURRENT_RESULT&lt;/code&gt;,
-                   &lt;code&gt;Statement.KEEP_CURRENT_RESULT&lt;/code&gt;, or
-                   &lt;code&gt;Statement.CLOSE_ALL_RESULTS&lt;/code&gt;</param>
-        <summary>Moves to this &lt;code&gt;Statement&lt;/code&gt; object's next result, deals with
-            any current &lt;code&gt;ResultSet&lt;/code&gt; object(s) according  to the instructions
+                   <c>ResultSet</c> objects obtained using the method
+                   <c>getResultSet</c>:
+                   <c>Statement.CLOSE_CURRENT_RESULT</c>,
+                   <c>Statement.KEEP_CURRENT_RESULT</c>, or
+                   <c>Statement.CLOSE_ALL_RESULTS</c></param>
+        <summary>Moves to this <c>Statement</c> object's next result, deals with
+            any current <c>ResultSet</c> object(s) according  to the instructions
             specified by the given flag, and returns
-            &lt;code&gt;true&lt;/code&gt; if the next result is a &lt;code&gt;ResultSet&lt;/code&gt; object.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if the next result is a &lt;code&gt;ResultSet&lt;/code&gt;
-                    object; &lt;code&gt;false&lt;/code&gt; if it is an update count or there are no
+            <c>true</c> if the next result is a <c>ResultSet</c> object.</summary>
+        <returns>
+          <c>true</c> if the next result is a <c>ResultSet</c>
+                    object; <c>false</c> if it is an update count or there are no
                     more results</returns>
         <remarks>
           <para>
@@ -1107,8 +1111,8 @@
       </ReturnValue>
       <MemberValue>2</MemberValue>
       <Docs>
-        <summary>The constant indicating that the current &lt;code&gt;ResultSet&lt;/code&gt; object
-            should not be closed when calling &lt;code&gt;getMoreResults&lt;/code&gt;.</summary>
+        <summary>The constant indicating that the current <c>ResultSet</c> object
+            should not be closed when calling <c>getMoreResults</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -1521,9 +1525,9 @@
       <Docs>
         <param name="name">the new cursor name, which must be unique within
                         a connection</param>
-        <summary>Sets the SQL cursor name to the given &lt;code&gt;String&lt;/code&gt;, which
-            will be used by subsequent &lt;code&gt;Statement&lt;/code&gt; object
-            &lt;code&gt;execute&lt;/code&gt; methods.</summary>
+        <summary>Sets the SQL cursor name to the given <c>String</c>, which
+            will be used by subsequent <c>Statement</c> object
+            <c>execute</c> methods.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -1564,8 +1568,9 @@
         <Parameter Name="enable" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="enable">&lt;code&gt;true&lt;/code&gt; to enable escape processing;
-                  &lt;code&gt;false&lt;/code&gt; to disable it</param>
+        <param name="enable">
+          <c>true</c> to enable escape processing;
+                  <c>false</c> to disable it</param>
         <summary>Sets escape processing on or off.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.Sql/IStruct.xml b/docs/Mono.Android/en/Java.Sql/IStruct.xml
index e549cad84d..a1ea37fd1d 100644
--- a/docs/Mono.Android/en/Java.Sql/IStruct.xml
+++ b/docs/Mono.Android/en/Java.Sql/IStruct.xml
@@ -64,7 +64,7 @@
       <Parameters />
       <Docs>
         <summary>Produces the ordered values of the attributes of the SQL
-            structured type that this &lt;code&gt;Struct&lt;/code&gt; object represents.</summary>
+            structured type that this <c>Struct</c> object represents.</summary>
         <returns>an array containing the ordered attribute values</returns>
         <remarks>
           <para>
@@ -108,7 +108,7 @@
       <Docs>
         <param name="map">a mapping of SQL type names to Java classes</param>
         <summary>Produces the ordered values of the attributes of the SQL
-            structured type that this &lt;code&gt;Struct&lt;/code&gt; object represents.</summary>
+            structured type that this <c>Struct</c> object represents.</summary>
         <returns>an array containing the ordered attribute values</returns>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.Sql/ParameterMetaData.xml b/docs/Mono.Android/en/Java.Sql/ParameterMetaData.xml
index 16853119e8..82a5e4ab13 100644
--- a/docs/Mono.Android/en/Java.Sql/ParameterMetaData.xml
+++ b/docs/Mono.Android/en/Java.Sql/ParameterMetaData.xml
@@ -225,7 +225,7 @@
       <MemberValue>0</MemberValue>
       <Docs>
         <summary>The constant indicating that a
-            parameter will not allow &lt;code&gt;NULL&lt;/code&gt; values.</summary>
+            parameter will not allow <c>NULL</c> values.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -267,7 +267,7 @@
       <MemberValue>1</MemberValue>
       <Docs>
         <summary>The constant indicating that a
-            parameter will allow &lt;code&gt;NULL&lt;/code&gt; values.</summary>
+            parameter will allow <c>NULL</c> values.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.Sql/ResultSet.xml b/docs/Mono.Android/en/Java.Sql/ResultSet.xml
index d99e348b0d..48cf89f2b4 100644
--- a/docs/Mono.Android/en/Java.Sql/ResultSet.xml
+++ b/docs/Mono.Android/en/Java.Sql/ResultSet.xml
@@ -60,7 +60,7 @@
       </ReturnValue>
       <MemberValue>2</MemberValue>
       <Docs>
-        <summary>The constant indicating that open &lt;code&gt;ResultSet&lt;/code&gt; objects with this
+        <summary>The constant indicating that open <c>ResultSet</c> objects with this
             holdability will be closed when the current transaction is commited.</summary>
         <remarks>
           <para>
@@ -103,7 +103,7 @@
       <MemberValue>1007</MemberValue>
       <Docs>
         <summary>The constant indicating the concurrency mode for a
-            &lt;code&gt;ResultSet&lt;/code&gt; object that may NOT be updated.</summary>
+            <c>ResultSet</c> object that may NOT be updated.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -145,7 +145,7 @@
       <MemberValue>1008</MemberValue>
       <Docs>
         <summary>The constant indicating the concurrency mode for a
-            &lt;code&gt;ResultSet&lt;/code&gt; object that may be updated.</summary>
+            <c>ResultSet</c> object that may be updated.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -312,7 +312,7 @@
       </ReturnValue>
       <MemberValue>1</MemberValue>
       <Docs>
-        <summary>The constant indicating that open &lt;code&gt;ResultSet&lt;/code&gt; objects with this
+        <summary>The constant indicating that open <c>ResultSet</c> objects with this
             holdability will remain open when the current transaction is commited.</summary>
         <remarks>
           <para>
@@ -354,7 +354,7 @@
       </ReturnValue>
       <MemberValue>1003</MemberValue>
       <Docs>
-        <summary>The constant indicating the type for a &lt;code&gt;ResultSet&lt;/code&gt; object
+        <summary>The constant indicating the type for a <c>ResultSet</c> object
             whose cursor may move only forward.</summary>
         <remarks>
           <para>
@@ -396,9 +396,9 @@
       </ReturnValue>
       <MemberValue>1004</MemberValue>
       <Docs>
-        <summary>The constant indicating the type for a &lt;code&gt;ResultSet&lt;/code&gt; object
+        <summary>The constant indicating the type for a <c>ResultSet</c> object
             that is scrollable but generally not sensitive to changes to the data
-            that underlies the &lt;code&gt;ResultSet&lt;/code&gt;.</summary>
+            that underlies the <c>ResultSet</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -439,9 +439,9 @@
       </ReturnValue>
       <MemberValue>1005</MemberValue>
       <Docs>
-        <summary>The constant indicating the type for a &lt;code&gt;ResultSet&lt;/code&gt; object
+        <summary>The constant indicating the type for a <c>ResultSet</c> object
             that is scrollable and generally sensitive to changes to the data
-            that underlies the &lt;code&gt;ResultSet&lt;/code&gt;.</summary>
+            that underlies the <c>ResultSet</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.Sql/ResultSetMetaData.xml b/docs/Mono.Android/en/Java.Sql/ResultSetMetaData.xml
index 842c280ab8..88a41671ae 100644
--- a/docs/Mono.Android/en/Java.Sql/ResultSetMetaData.xml
+++ b/docs/Mono.Android/en/Java.Sql/ResultSetMetaData.xml
@@ -60,7 +60,7 @@
       <MemberValue>0</MemberValue>
       <Docs>
         <summary>The constant indicating that a
-            column does not allow &lt;code&gt;NULL&lt;/code&gt; values.</summary>
+            column does not allow <c>NULL</c> values.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -102,7 +102,7 @@
       <MemberValue>1</MemberValue>
       <Docs>
         <summary>The constant indicating that a
-            column allows &lt;code&gt;NULL&lt;/code&gt; values.</summary>
+            column allows <c>NULL</c> values.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.Sql/SQLClientInfoException.xml b/docs/Mono.Android/en/Java.Sql/SQLClientInfoException.xml
index 0153592bef..eeb5e23f6e 100644
--- a/docs/Mono.Android/en/Java.Sql/SQLClientInfoException.xml
+++ b/docs/Mono.Android/en/Java.Sql/SQLClientInfoException.xml
@@ -19,7 +19,7 @@
   </Attributes>
   <Docs since="9">
     <summary>The subclass of <c>SQLException</c> is thrown when one or more client info properties
-            could not be set on a &lt;code&gt;Connection&lt;/code&gt;.</summary>
+            could not be set on a <c>Connection</c>.</summary>
     <remarks>
       <para>
         <format type="text/html">
@@ -52,7 +52,7 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <summary>Constructs a &lt;code&gt;SQLClientInfoException&lt;/code&gt;  Object.</summary>
+        <summary>Constructs a <c>SQLClientInfoException</c>  Object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -93,10 +93,9 @@
                                              contain the names of the client info
                                              properties that could not be set and
                                              the values contain one of the reason codes
-                                             defined in &lt;code&gt;ClientInfoStatus&lt;/code&gt;
-            &lt;p&gt;</param>
-        <summary>Constructs a &lt;code&gt;SQLClientInfoException&lt;/code&gt; object initialized with a
-            given &lt;code&gt;failedProperties&lt;/code&gt;.</summary>
+                                             defined in <c>ClientInfoStatus</c>&lt;p&gt;</param>
+        <summary>Constructs a <c>SQLClientInfoException</c> object initialized with a
+            given <c>failedProperties</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -137,12 +136,12 @@
                                              contain the names of the client info
                                              properties that could not be set and
                                              the values contain one of the reason codes
-                                             defined in &lt;code&gt;ClientInfoStatus&lt;/code&gt;</param>
-        <param name="cause">the (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+                                             defined in <c>ClientInfoStatus</c></param>
+        <param name="cause">the (which is saved for later retrieval by the <c>getCause()</c> method); may be null indicating
                 the cause is non-existent or unknown.
             &lt;p&gt;</param>
-        <summary>Constructs a &lt;code&gt;SQLClientInfoException&lt;/code&gt; object initialized with
-            a given &lt;code&gt;cause&lt;/code&gt; and &lt;code&gt;failedProperties&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>SQLClientInfoException</c> object initialized with
+            a given <c>cause</c> and <c>failedProperties</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -207,10 +206,9 @@
                                              contain the names of the client info
                                              properties that could not be set and
                                              the values contain one of the reason codes
-                                             defined in &lt;code&gt;ClientInfoStatus&lt;/code&gt;
-            &lt;p&gt;</param>
-        <summary>Constructs a &lt;code&gt;SQLClientInfoException&lt;/code&gt; object initialized with a
-            given &lt;code&gt;reason&lt;/code&gt; and &lt;code&gt;failedProperties&lt;/code&gt;.</summary>
+                                             defined in <c>ClientInfoStatus</c>&lt;p&gt;</param>
+        <summary>Constructs a <c>SQLClientInfoException</c> object initialized with a
+            given <c>reason</c> and <c>failedProperties</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -253,13 +251,13 @@
                                              contain the names of the client info
                                              properties that could not be set and
                                              the values contain one of the reason codes
-                                             defined in &lt;code&gt;ClientInfoStatus&lt;/code&gt;</param>
-        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+                                             defined in <c>ClientInfoStatus</c></param>
+        <param name="cause">the underlying reason for this <c>SQLException</c> (which is saved for later retrieval by the <c>getCause()</c> method); may be null indicating
                 the cause is non-existent or unknown.
             &lt;p&gt;</param>
-        <summary>Constructs a &lt;code&gt;SQLClientInfoException&lt;/code&gt; object initialized with a
-            given &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;cause&lt;/code&gt; and
-            &lt;code&gt;failedProperties&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>SQLClientInfoException</c> object initialized with a
+            given <c>reason</c>, <c>cause</c> and
+            <c>failedProperties</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -303,11 +301,10 @@
                                              contain the names of the client info
                                              properties that could not be set and
                                              the values contain one of the reason codes
-                                             defined in &lt;code&gt;ClientInfoStatus&lt;/code&gt;
-            &lt;p&gt;</param>
-        <summary>Constructs a &lt;code&gt;SQLClientInfoException&lt;/code&gt; object initialized with a
-            given  &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt;  and
-            &lt;code&gt;failedProperties&lt;/code&gt;.</summary>
+                                             defined in <c>ClientInfoStatus</c>&lt;p&gt;</param>
+        <summary>Constructs a <c>SQLClientInfoException</c> object initialized with a
+            given  <c>reason</c>, <c>SQLState</c>  and
+            <c>failedProperties</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -352,13 +349,13 @@
                                              contain the names of the client info
                                              properties that could not be set and
                                              the values contain one of the reason codes
-                                             defined in &lt;code&gt;ClientInfoStatus&lt;/code&gt;</param>
-        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+                                             defined in <c>ClientInfoStatus</c></param>
+        <param name="cause">the underlying reason for this <c>SQLException</c> (which is saved for later retrieval by the <c>getCause()</c> method); may be null indicating
                 the cause is non-existent or unknown.
             &lt;p&gt;</param>
-        <summary>Constructs a &lt;code&gt;SQLClientInfoException&lt;/code&gt; object initialized with a
-            given  &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt;, &lt;code&gt;cause&lt;/code&gt;
-            and &lt;code&gt;failedProperties&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>SQLClientInfoException</c> object initialized with a
+            given  <c>reason</c>, <c>SQLState</c>, <c>cause</c>
+            and <c>failedProperties</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -404,11 +401,10 @@
                                              contain the names of the client info
                                              properties that could not be set and
                                              the values contain one of the reason codes
-                                             defined in &lt;code&gt;ClientInfoStatus&lt;/code&gt;
-            &lt;p&gt;</param>
-        <summary>Constructs a &lt;code&gt;SQLClientInfoException&lt;/code&gt; object initialized with a
-            given  &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt;,
-            &lt;code&gt;vendorCode&lt;/code&gt;  and &lt;code&gt;failedProperties&lt;/code&gt;.</summary>
+                                             defined in <c>ClientInfoStatus</c>&lt;p&gt;</param>
+        <summary>Constructs a <c>SQLClientInfoException</c> object initialized with a
+            given  <c>reason</c>, <c>SQLState</c>,
+            <c>vendorCode</c>  and <c>failedProperties</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -455,14 +451,14 @@
                                              contain the names of the client info
                                              properties that could not be set and
                                              the values contain one of the reason codes
-                                             defined in &lt;code&gt;ClientInfoStatus&lt;/code&gt;</param>
-        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+                                             defined in <c>ClientInfoStatus</c></param>
+        <param name="cause">the underlying reason for this <c>SQLException</c> (which is saved for later retrieval by the <c>getCause()</c> method); may be null indicating
                 the cause is non-existent or unknown.
             &lt;p&gt;</param>
-        <summary>Constructs a &lt;code&gt;SQLClientInfoException&lt;/code&gt; object initialized with a
-            given  &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt;,
-            &lt;code&gt;cause&lt;/code&gt;, &lt;code&gt;vendorCode&lt;/code&gt; and
-            &lt;code&gt;failedProperties&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>SQLClientInfoException</c> object initialized with a
+            given  <c>reason</c>, <c>SQLState</c>,
+            <c>cause</c>, <c>vendorCode</c> and
+            <c>failedProperties</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.Sql/SQLDataException.xml b/docs/Mono.Android/en/Java.Sql/SQLDataException.xml
index c702bb03e9..32beaea3ab 100644
--- a/docs/Mono.Android/en/Java.Sql/SQLDataException.xml
+++ b/docs/Mono.Android/en/Java.Sql/SQLDataException.xml
@@ -52,7 +52,7 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <summary>Constructs a &lt;code&gt;SQLDataException&lt;/code&gt; object.</summary>
+        <summary>Constructs a <c>SQLDataException</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -88,10 +88,10 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+        <param name="cause">the underlying reason for this <c>SQLException</c> (which is saved for later retrieval by the <c>getCause()</c> method); may be null indicating
                 the cause is non-existent or unknown.</param>
-        <summary>Constructs a &lt;code&gt;SQLDataException&lt;/code&gt; object with a given
-            &lt;code&gt;cause&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>SQLDataException</c> object with a given
+            <c>cause</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -128,8 +128,8 @@
       </Parameters>
       <Docs>
         <param name="reason">a description of the exception</param>
-        <summary>Constructs a &lt;code&gt;SQLDataException&lt;/code&gt; object with a given
-            &lt;code&gt;reason&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>SQLDataException</c> object with a given
+            <c>reason</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -190,10 +190,10 @@
       </Parameters>
       <Docs>
         <param name="reason">a description of the exception.</param>
-        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+        <param name="cause">the underlying reason for this <c>SQLException</c> (which is saved for later retrieval by the <c>getCause()</c> method); may be null indicating
                 the cause is non-existent or unknown.</param>
-        <summary>Constructs a &lt;code&gt;SQLDataException&lt;/code&gt; object with a given
-            &lt;code&gt;reason&lt;/code&gt; and  &lt;code&gt;cause&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>SQLDataException</c> object with a given
+            <c>reason</c> and  <c>cause</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -232,8 +232,8 @@
       <Docs>
         <param name="reason">a description of the exception</param>
         <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
-        <summary>Constructs a &lt;code&gt;SQLDataException&lt;/code&gt; object with a given
-            &lt;code&gt;reason&lt;/code&gt; and &lt;code&gt;SQLState&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>SQLDataException</c> object with a given
+            <c>reason</c> and <c>SQLState</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -273,10 +273,10 @@
       <Docs>
         <param name="reason">a description of the exception.</param>
         <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
-        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+        <param name="cause">the underlying reason for this <c>SQLException</c> (which is saved for later retrieval by the <c>getCause()</c> method); may be null indicating
                 the cause is non-existent or unknown.</param>
-        <summary>Constructs a &lt;code&gt;SQLDataException&lt;/code&gt; object with a given
-            &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt; and  &lt;code&gt;cause&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>SQLDataException</c> object with a given
+            <c>reason</c>, <c>SQLState</c> and  <c>cause</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -317,9 +317,9 @@
         <param name="reason">a description of the exception</param>
         <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
         <param name="vendorCode">a database vendor specific exception code</param>
-        <summary>Constructs a &lt;code&gt;SQLDataException&lt;/code&gt; object with a given
-            &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt;  and
-            &lt;code&gt;vendorCode&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>SQLDataException</c> object with a given
+            <c>reason</c>, <c>SQLState</c>  and
+            <c>vendorCode</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -361,11 +361,11 @@
         <param name="reason">a description of the exception</param>
         <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
         <param name="vendorCode">a database vendor-specific exception code</param>
-        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+        <param name="cause">the underlying reason for this <c>SQLException</c> (which is saved for later retrieval by the <c>getCause()</c> method); may be null indicating
                 the cause is non-existent or unknown.</param>
-        <summary>Constructs a &lt;code&gt;SQLDataException&lt;/code&gt; object with a given
-            &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt;, &lt;code&gt;vendorCode&lt;/code&gt;
-            and  &lt;code&gt;cause&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>SQLDataException</c> object with a given
+            <c>reason</c>, <c>SQLState</c>, <c>vendorCode</c>
+            and  <c>cause</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.Sql/SQLException.xml b/docs/Mono.Android/en/Java.Sql/SQLException.xml
index 1cccbea923..b02db40492 100644
--- a/docs/Mono.Android/en/Java.Sql/SQLException.xml
+++ b/docs/Mono.Android/en/Java.Sql/SQLException.xml
@@ -68,7 +68,7 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <summary>Constructs a &lt;code&gt;SQLException&lt;/code&gt; object.</summary>
+        <summary>Constructs a <c>SQLException</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -104,11 +104,11 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt;
-            (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method);
+        <param name="cause">the underlying reason for this <c>SQLException</c>
+            (which is saved for later retrieval by the <c>getCause()</c> method);
             may be null indicating the cause is non-existent or unknown.</param>
-        <summary>Constructs a &lt;code&gt;SQLException&lt;/code&gt; object with a given
-            &lt;code&gt;cause&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>SQLException</c> object with a given
+            <c>cause</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -145,8 +145,8 @@
       </Parameters>
       <Docs>
         <param name="reason">a description of the exception</param>
-        <summary>Constructs a &lt;code&gt;SQLException&lt;/code&gt; object with a given
-            &lt;code&gt;reason&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>SQLException</c> object with a given
+            <c>reason</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -207,11 +207,11 @@
       </Parameters>
       <Docs>
         <param name="reason">a description of the exception.</param>
-        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt;
-            (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method);
+        <param name="cause">the underlying reason for this <c>SQLException</c>
+            (which is saved for later retrieval by the <c>getCause()</c> method);
             may be null indicating the cause is non-existent or unknown.</param>
-        <summary>Constructs a &lt;code&gt;SQLException&lt;/code&gt; object with a given
-            &lt;code&gt;reason&lt;/code&gt; and  &lt;code&gt;cause&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>SQLException</c> object with a given
+            <c>reason</c> and  <c>cause</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -250,8 +250,8 @@
       <Docs>
         <param name="reason">a description of the exception</param>
         <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
-        <summary>Constructs a &lt;code&gt;SQLException&lt;/code&gt; object with a given
-            &lt;code&gt;reason&lt;/code&gt; and &lt;code&gt;SQLState&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>SQLException</c> object with a given
+            <c>reason</c> and <c>SQLState</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -291,12 +291,12 @@
       <Docs>
         <param name="reason">a description of the exception.</param>
         <param name="sqlState">an XOPEN or SQL:2003 code identifying the exception</param>
-        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt;
+        <param name="cause">the underlying reason for this <c>SQLException</c>
             (which is saved for later retrieval by the
-            &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+            <c>getCause()</c> method); may be null indicating
                 the cause is non-existent or unknown.</param>
-        <summary>Constructs a &lt;code&gt;SQLException&lt;/code&gt; object with a given
-            &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt; and  &lt;code&gt;cause&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>SQLException</c> object with a given
+            <c>reason</c>, <c>SQLState</c> and  <c>cause</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -337,9 +337,9 @@
         <param name="reason">a description of the exception</param>
         <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
         <param name="vendorCode">a database vendor-specific exception code</param>
-        <summary>Constructs a &lt;code&gt;SQLException&lt;/code&gt; object with a given
-            &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt;  and
-            &lt;code&gt;vendorCode&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>SQLException</c> object with a given
+            <c>reason</c>, <c>SQLState</c>  and
+            <c>vendorCode</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -381,12 +381,12 @@
         <param name="reason">a description of the exception</param>
         <param name="sqlState">an XOPEN or SQL:2003 code identifying the exception</param>
         <param name="vendorCode">a database vendor-specific exception code</param>
-        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt;
-            (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method);
+        <param name="cause">the underlying reason for this <c>SQLException</c>
+            (which is saved for later retrieval by the <c>getCause()</c> method);
             may be null indicating the cause is non-existent or unknown.</param>
-        <summary>Constructs a &lt;code&gt;SQLException&lt;/code&gt; object with a given
-            &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt;, &lt;code&gt;vendorCode&lt;/code&gt;
-            and  &lt;code&gt;cause&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>SQLException</c> object with a given
+            <c>reason</c>, <c>SQLState</c>, <c>vendorCode</c>
+            and  <c>cause</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -423,7 +423,7 @@
       </ReturnValue>
       <Docs>
         <summary>Retrieves the vendor-specific exception code
-            for this &lt;code&gt;SQLException&lt;/code&gt; object.</summary>
+            for this <c>SQLException</c> object.</summary>
         <value>the vendor's error code</value>
         <remarks>
           <para>
@@ -563,11 +563,11 @@
       </ReturnValue>
       <Docs>
         <param name="ex">the new exception that will be added to the end of
-                       the &lt;code&gt;SQLException&lt;/code&gt; chain</param>
+                       the <c>SQLException</c> chain</param>
         <summary>Retrieves the exception chained to this
-            &lt;code&gt;SQLException&lt;/code&gt; object by setNextException(SQLException ex). -or- Adds an &lt;code&gt;SQLException&lt;/code&gt; object to the end of the chain.</summary>
-        <value>the next &lt;code&gt;SQLException&lt;/code&gt; object in the chain;
-                    &lt;code&gt;null&lt;/code&gt; if there are none</value>
+            <c>SQLException</c> object by setNextException(SQLException ex). -or- Adds an <c>SQLException</c> object to the end of the chain.</summary>
+        <value>the next <c>SQLException</c> object in the chain;
+                    <c>null</c> if there are none</value>
         <remarks>
           <para>Property getter documentation:</para>
           <para>
@@ -610,7 +610,7 @@
         <ReturnType>System.String</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Retrieves the SQLState for this &lt;code&gt;SQLException&lt;/code&gt; object.</summary>
+        <summary>Retrieves the SQLState for this <c>SQLException</c> object.</summary>
         <value>the SQLState value</value>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.Sql/SQLFeatureNotSupportedException.xml b/docs/Mono.Android/en/Java.Sql/SQLFeatureNotSupportedException.xml
index 95d71f2207..04345393b0 100644
--- a/docs/Mono.Android/en/Java.Sql/SQLFeatureNotSupportedException.xml
+++ b/docs/Mono.Android/en/Java.Sql/SQLFeatureNotSupportedException.xml
@@ -52,7 +52,7 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <summary>Constructs a &lt;code&gt;SQLFeatureNotSupportedException&lt;/code&gt; object.</summary>
+        <summary>Constructs a <c>SQLFeatureNotSupportedException</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -88,10 +88,10 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval bythe &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+        <param name="cause">the underlying reason for this <c>SQLException</c> (which is saved for later retrieval bythe <c>getCause()</c> method); may be null indicating
                 the cause is non-existent or unknown.</param>
-        <summary>Constructs a &lt;code&gt;SQLFeatureNotSupportedException&lt;/code&gt; object
-              with a given  &lt;code&gt;cause&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>SQLFeatureNotSupportedException</c> object
+              with a given  <c>cause</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -128,8 +128,8 @@
       </Parameters>
       <Docs>
         <param name="reason">a description of the exception</param>
-        <summary>Constructs a &lt;code&gt;SQLFeatureNotSupportedException&lt;/code&gt; object
-            with a given &lt;code&gt;reason&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>SQLFeatureNotSupportedException</c> object
+            with a given <c>reason</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -190,11 +190,11 @@
       </Parameters>
       <Docs>
         <param name="reason">a description of the exception.</param>
-        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+        <param name="cause">the underlying reason for this <c>SQLException</c> (which is saved for later retrieval by the <c>getCause()</c> method); may be null indicating
                 the cause is non-existent or unknown.</param>
-        <summary>Constructs a &lt;code&gt;SQLFeatureNotSupportedException&lt;/code&gt; object
+        <summary>Constructs a <c>SQLFeatureNotSupportedException</c> object
             with a given
-            &lt;code&gt;reason&lt;/code&gt; and  &lt;code&gt;cause&lt;/code&gt;.</summary>
+            <c>reason</c> and  <c>cause</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -233,8 +233,8 @@
       <Docs>
         <param name="reason">a description of the exception</param>
         <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
-        <summary>Constructs a &lt;code&gt;SQLFeatureNotSupportedException&lt;/code&gt; object
-            with a given &lt;code&gt;reason&lt;/code&gt; and &lt;code&gt;SQLState&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>SQLFeatureNotSupportedException</c> object
+            with a given <c>reason</c> and <c>SQLState</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -274,11 +274,11 @@
       <Docs>
         <param name="reason">a description of the exception.</param>
         <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
-        <param name="cause">the (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+        <param name="cause">the (which is saved for later retrieval by the <c>getCause()</c> method); may be null indicating
                 the cause is non-existent or unknown.</param>
-        <summary>Constructs a &lt;code&gt;SQLFeatureNotSupportedException&lt;/code&gt; object
+        <summary>Constructs a <c>SQLFeatureNotSupportedException</c> object
             with a given
-            &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt; and  &lt;code&gt;cause&lt;/code&gt;.</summary>
+            <c>reason</c>, <c>SQLState</c> and  <c>cause</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -319,9 +319,9 @@
         <param name="reason">a description of the exception</param>
         <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
         <param name="vendorCode">a database vendor specific exception code</param>
-        <summary>Constructs a &lt;code&gt;SQLFeatureNotSupportedException&lt;/code&gt; object
-             with a given &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt;  and
-            &lt;code&gt;vendorCode&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>SQLFeatureNotSupportedException</c> object
+             with a given <c>reason</c>, <c>SQLState</c>  and
+            <c>vendorCode</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -363,12 +363,12 @@
         <param name="reason">a description of the exception</param>
         <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
         <param name="vendorCode">a database vendor-specific exception code</param>
-        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+        <param name="cause">the underlying reason for this <c>SQLException</c> (which is saved for later retrieval by the <c>getCause()</c> method); may be null indicating
                 the cause is non-existent or unknown.</param>
-        <summary>Constructs a &lt;code&gt;SQLFeatureNotSupportedException&lt;/code&gt; object
+        <summary>Constructs a <c>SQLFeatureNotSupportedException</c> object
             with a given
-            &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt;, &lt;code&gt;vendorCode&lt;/code&gt;
-            and  &lt;code&gt;cause&lt;/code&gt;.</summary>
+            <c>reason</c>, <c>SQLState</c>, <c>vendorCode</c>
+            and  <c>cause</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.Sql/SQLIntegrityConstraintViolationException.xml b/docs/Mono.Android/en/Java.Sql/SQLIntegrityConstraintViolationException.xml
index c203bc945c..803e1f9bf9 100644
--- a/docs/Mono.Android/en/Java.Sql/SQLIntegrityConstraintViolationException.xml
+++ b/docs/Mono.Android/en/Java.Sql/SQLIntegrityConstraintViolationException.xml
@@ -52,7 +52,7 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <summary>Constructs a &lt;code&gt;SQLIntegrityConstraintViolationException&lt;/code&gt; object.</summary>
+        <summary>Constructs a <c>SQLIntegrityConstraintViolationException</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -88,10 +88,10 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt;  method); may be null indicating
+        <param name="cause">the underlying reason for this <c>SQLException</c> (which is saved for later retrieval by the <c>getCause()</c>  method); may be null indicating
                 the cause is non-existent or unknown.</param>
-        <summary>Constructs an &lt;code&gt;SQLIntegrityConstraintViolationException&lt;/code&gt; object with
-             a given  &lt;code&gt;cause&lt;/code&gt;.</summary>
+        <summary>Constructs an <c>SQLIntegrityConstraintViolationException</c> object with
+             a given  <c>cause</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -128,8 +128,8 @@
       </Parameters>
       <Docs>
         <param name="reason">a description of the exception</param>
-        <summary>Constructs a &lt;code&gt;SQLIntegrityConstraintViolationException&lt;/code&gt;
-             with a given &lt;code&gt;reason&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>SQLIntegrityConstraintViolationException</c>
+             with a given <c>reason</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -190,11 +190,11 @@
       </Parameters>
       <Docs>
         <param name="reason">a description of the exception.</param>
-        <param name="cause">the (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+        <param name="cause">the (which is saved for later retrieval by the <c>getCause()</c> method); may be null indicating
                 the cause is non-existent or unknown.</param>
-        <summary>Constructs a &lt;code&gt;SQLIntegrityConstraintViolationException&lt;/code&gt; object
+        <summary>Constructs a <c>SQLIntegrityConstraintViolationException</c> object
             with a given
-            &lt;code&gt;reason&lt;/code&gt; and  &lt;code&gt;cause&lt;/code&gt;.</summary>
+            <c>reason</c> and  <c>cause</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -233,8 +233,8 @@
       <Docs>
         <param name="reason">a description of the exception</param>
         <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
-        <summary>Constructs a &lt;code&gt;SQLIntegrityConstraintViolationException&lt;/code&gt;
-            object with a given &lt;code&gt;reason&lt;/code&gt; and &lt;code&gt;SQLState&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>SQLIntegrityConstraintViolationException</c>
+            object with a given <c>reason</c> and <c>SQLState</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -274,11 +274,11 @@
       <Docs>
         <param name="reason">a description of the exception.</param>
         <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
-        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt;  method); may be null indicating
+        <param name="cause">the underlying reason for this <c>SQLException</c> (which is saved for later retrieval by the <c>getCause()</c>  method); may be null indicating
                 the cause is non-existent or unknown.</param>
-        <summary>Constructs a &lt;code&gt;SQLIntegrityConstraintViolationException&lt;/code&gt; object
+        <summary>Constructs a <c>SQLIntegrityConstraintViolationException</c> object
              with a given
-            &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt; and  &lt;code&gt;cause&lt;/code&gt;.</summary>
+            <c>reason</c>, <c>SQLState</c> and  <c>cause</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -319,9 +319,9 @@
         <param name="reason">a description of the exception</param>
         <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
         <param name="vendorCode">a database vendor specific exception code</param>
-        <summary>Constructs a &lt;code&gt;SQLIntegrityConstraintViolationException&lt;/code&gt; object
-            with a given &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt;  and
-            &lt;code&gt;vendorCode&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>SQLIntegrityConstraintViolationException</c> object
+            with a given <c>reason</c>, <c>SQLState</c>  and
+            <c>vendorCode</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -363,12 +363,12 @@
         <param name="reason">a description of the exception</param>
         <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
         <param name="vendorCode">a database vendor-specific exception code</param>
-        <param name="cause">the (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+        <param name="cause">the (which is saved for later retrieval by the <c>getCause()</c> method); may be null indicating
                 the cause is non-existent or unknown.</param>
-        <summary>Constructs a &lt;code&gt;SQLIntegrityConstraintViolationException&lt;/code&gt; object
+        <summary>Constructs a <c>SQLIntegrityConstraintViolationException</c> object
             with a given
-            &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt;, &lt;code&gt;vendorCode&lt;/code&gt;
-            and  &lt;code&gt;cause&lt;/code&gt;.</summary>
+            <c>reason</c>, <c>SQLState</c>, <c>vendorCode</c>
+            and  <c>cause</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.Sql/SQLInvalidAuthorizationSpecException.xml b/docs/Mono.Android/en/Java.Sql/SQLInvalidAuthorizationSpecException.xml
index 3d12e9ebe1..f0468081f7 100644
--- a/docs/Mono.Android/en/Java.Sql/SQLInvalidAuthorizationSpecException.xml
+++ b/docs/Mono.Android/en/Java.Sql/SQLInvalidAuthorizationSpecException.xml
@@ -52,7 +52,7 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <summary>Constructs a &lt;code&gt;SQLInvalidAuthorizationSpecException&lt;/code&gt; object.</summary>
+        <summary>Constructs a <c>SQLInvalidAuthorizationSpecException</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -88,10 +88,10 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+        <param name="cause">the underlying reason for this <c>SQLException</c> (which is saved for later retrieval by the <c>getCause()</c> method); may be null indicating
                 the cause is non-existent or unknown.</param>
-        <summary>Constructs a &lt;code&gt;SQLInvalidAuthorizationSpecException&lt;/code&gt; object
-            with a given  &lt;code&gt;cause&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>SQLInvalidAuthorizationSpecException</c> object
+            with a given  <c>cause</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -128,8 +128,8 @@
       </Parameters>
       <Docs>
         <param name="reason">a description of the exception</param>
-        <summary>Constructs a &lt;code&gt;SQLInvalidAuthorizationSpecException&lt;/code&gt; object
-             with a given &lt;code&gt;reason&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>SQLInvalidAuthorizationSpecException</c> object
+             with a given <c>reason</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -190,11 +190,11 @@
       </Parameters>
       <Docs>
         <param name="reason">a description of the exception.</param>
-        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+        <param name="cause">the underlying reason for this <c>SQLException</c> (which is saved for later retrieval by the <c>getCause()</c> method); may be null indicating
                 the cause is non-existent or unknown.</param>
-        <summary>Constructs a &lt;code&gt;SQLInvalidAuthorizationSpecException&lt;/code&gt; object
+        <summary>Constructs a <c>SQLInvalidAuthorizationSpecException</c> object
              with a given
-            &lt;code&gt;reason&lt;/code&gt; and  &lt;code&gt;cause&lt;/code&gt;.</summary>
+            <c>reason</c> and  <c>cause</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -233,8 +233,8 @@
       <Docs>
         <param name="reason">a description of the exception</param>
         <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
-        <summary>Constructs a &lt;code&gt;SQLInvalidAuthorizationSpecException&lt;/code&gt; object
-            with a given &lt;code&gt;reason&lt;/code&gt; and &lt;code&gt;SQLState&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>SQLInvalidAuthorizationSpecException</c> object
+            with a given <c>reason</c> and <c>SQLState</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -274,11 +274,11 @@
       <Docs>
         <param name="reason">a description of the exception.</param>
         <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
-        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt;  method); may be null indicating
+        <param name="cause">the underlying reason for this <c>SQLException</c> (which is saved for later retrieval by the <c>getCause()</c>  method); may be null indicating
                 the cause is non-existent or unknown.</param>
-        <summary>Constructs a &lt;code&gt;SQLInvalidAuthorizationSpecException&lt;/code&gt; object
+        <summary>Constructs a <c>SQLInvalidAuthorizationSpecException</c> object
              with a given
-            &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt; and  &lt;code&gt;cause&lt;/code&gt;.</summary>
+            <c>reason</c>, <c>SQLState</c> and  <c>cause</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -319,9 +319,9 @@
         <param name="reason">a description of the exception</param>
         <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
         <param name="vendorCode">a database vendor specific exception code</param>
-        <summary>Constructs a &lt;code&gt;SQLInvalidAuthorizationSpecException&lt;/code&gt; object
-            with a given &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt;  and
-            &lt;code&gt;vendorCode&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>SQLInvalidAuthorizationSpecException</c> object
+            with a given <c>reason</c>, <c>SQLState</c>  and
+            <c>vendorCode</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -363,12 +363,12 @@
         <param name="reason">a description of the exception</param>
         <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
         <param name="vendorCode">a database vendor-specific exception code</param>
-        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+        <param name="cause">the underlying reason for this <c>SQLException</c> (which is saved for later retrieval by the <c>getCause()</c> method); may be null indicating
                 the cause is non-existent or unknown.</param>
-        <summary>Constructs a &lt;code&gt;SQLInvalidAuthorizationSpecException&lt;/code&gt; object
+        <summary>Constructs a <c>SQLInvalidAuthorizationSpecException</c> object
             with a given
-            &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt;, &lt;code&gt;vendorCode&lt;/code&gt;
-            and  &lt;code&gt;cause&lt;/code&gt;.</summary>
+            <c>reason</c>, <c>SQLState</c>, <c>vendorCode</c>
+            and  <c>cause</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.Sql/SQLNonTransientConnectionException.xml b/docs/Mono.Android/en/Java.Sql/SQLNonTransientConnectionException.xml
index 971b573738..4efd04d466 100644
--- a/docs/Mono.Android/en/Java.Sql/SQLNonTransientConnectionException.xml
+++ b/docs/Mono.Android/en/Java.Sql/SQLNonTransientConnectionException.xml
@@ -52,7 +52,7 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <summary>Constructs a &lt;code&gt;SQLNonTransientConnectionException&lt;/code&gt; object.</summary>
+        <summary>Constructs a <c>SQLNonTransientConnectionException</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -88,10 +88,10 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+        <param name="cause">the underlying reason for this <c>SQLException</c> (which is saved for later retrieval by the <c>getCause()</c> method); may be null indicating
                 the cause is non-existent or unknown.</param>
-        <summary>Constructs a &lt;code&gt;SQLNonTransientConnectionException&lt;/code&gt; object
-            with a given  &lt;code&gt;cause&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>SQLNonTransientConnectionException</c> object
+            with a given  <c>cause</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -128,8 +128,8 @@
       </Parameters>
       <Docs>
         <param name="reason">a description of the exception</param>
-        <summary>Constructs a &lt;code&gt;SQLNonTransientConnectionException&lt;/code&gt; object
-             with a given &lt;code&gt;reason&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>SQLNonTransientConnectionException</c> object
+             with a given <c>reason</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -190,11 +190,11 @@
       </Parameters>
       <Docs>
         <param name="reason">a description of the exception.</param>
-        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+        <param name="cause">the underlying reason for this <c>SQLException</c> (which is saved for later retrieval by the <c>getCause()</c> method); may be null indicating
                 the cause is non-existent or unknown.</param>
-        <summary>Constructs a &lt;code&gt;SQLTransientException&lt;/code&gt; object
+        <summary>Constructs a <c>SQLTransientException</c> object
             with a given
-            &lt;code&gt;reason&lt;/code&gt; and  &lt;code&gt;cause&lt;/code&gt;.</summary>
+            <c>reason</c> and  <c>cause</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -233,8 +233,8 @@
       <Docs>
         <param name="reason">a description of the exception</param>
         <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
-        <summary>Constructs a &lt;code&gt;SQLNonTransientConnectionException&lt;/code&gt; object
-            with a given &lt;code&gt;reason&lt;/code&gt; and &lt;code&gt;SQLState&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>SQLNonTransientConnectionException</c> object
+            with a given <c>reason</c> and <c>SQLState</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -274,11 +274,11 @@
       <Docs>
         <param name="reason">a description of the exception.</param>
         <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
-        <param name="cause">the (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+        <param name="cause">the (which is saved for later retrieval by the <c>getCause()</c> method); may be null indicating
                 the cause is non-existent or unknown.</param>
-        <summary>Constructs a &lt;code&gt;SQLNonTransientConnectionException&lt;/code&gt; object
+        <summary>Constructs a <c>SQLNonTransientConnectionException</c> object
             with a given
-            &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt; and  &lt;code&gt;cause&lt;/code&gt;.</summary>
+            <c>reason</c>, <c>SQLState</c> and  <c>cause</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -319,9 +319,9 @@
         <param name="reason">a description of the exception</param>
         <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
         <param name="vendorCode">a database vendor specific exception code</param>
-        <summary>Constructs a &lt;code&gt;SQLNonTransientConnectionException&lt;/code&gt; object
-            with a given &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt;  and
-            &lt;code&gt;vendorCode&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>SQLNonTransientConnectionException</c> object
+            with a given <c>reason</c>, <c>SQLState</c>  and
+            <c>vendorCode</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -363,12 +363,12 @@
         <param name="reason">a description of the exception</param>
         <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
         <param name="vendorCode">a database vendor-specific exception code</param>
-        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+        <param name="cause">the underlying reason for this <c>SQLException</c> (which is saved for later retrieval by the <c>getCause()</c> method); may be null indicating
                 the cause is non-existent or unknown.</param>
-        <summary>Constructs a &lt;code&gt;SQLNonTransientConnectionException&lt;/code&gt; object
+        <summary>Constructs a <c>SQLNonTransientConnectionException</c> object
             with a given
-            &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt;, &lt;code&gt;vendorCode&lt;/code&gt;
-            and  &lt;code&gt;cause&lt;/code&gt;.</summary>
+            <c>reason</c>, <c>SQLState</c>, <c>vendorCode</c>
+            and  <c>cause</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.Sql/SQLNonTransientException.xml b/docs/Mono.Android/en/Java.Sql/SQLNonTransientException.xml
index 68e98d162f..74e62fe21a 100644
--- a/docs/Mono.Android/en/Java.Sql/SQLNonTransientException.xml
+++ b/docs/Mono.Android/en/Java.Sql/SQLNonTransientException.xml
@@ -19,7 +19,7 @@
   </Attributes>
   <Docs since="9">
     <summary>The subclass of <c>SQLException</c> thrown when an instance where a retry
-            of the same operation would fail unless the cause of the &lt;code&gt;SQLException&lt;/code&gt;
+            of the same operation would fail unless the cause of the <c>SQLException</c>
             is corrected.</summary>
     <remarks>
       <para>
@@ -52,7 +52,7 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <summary>Constructs a &lt;code&gt;SQLNonTransientException&lt;/code&gt; object.</summary>
+        <summary>Constructs a <c>SQLNonTransientException</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -88,10 +88,10 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+        <param name="cause">the underlying reason for this <c>SQLException</c> (which is saved for later retrieval by the <c>getCause()</c> method); may be null indicating
                 the cause is non-existent or unknown.</param>
-        <summary>Constructs a &lt;code&gt;SQLNonTransientException&lt;/code&gt; object
-             with a given  &lt;code&gt;cause&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>SQLNonTransientException</c> object
+             with a given  <c>cause</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -128,8 +128,8 @@
       </Parameters>
       <Docs>
         <param name="reason">a description of the exception</param>
-        <summary>Constructs a &lt;code&gt;SQLNonTransientException&lt;/code&gt; object
-            with a given &lt;code&gt;reason&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>SQLNonTransientException</c> object
+            with a given <c>reason</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -190,11 +190,11 @@
       </Parameters>
       <Docs>
         <param name="reason">a description of the exception.</param>
-        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+        <param name="cause">the underlying reason for this <c>SQLException</c> (which is saved for later retrieval by the <c>getCause()</c> method); may be null indicating
                 the cause is non-existent or unknown.</param>
-        <summary>Constructs a &lt;code&gt;SQLTransientException&lt;/code&gt; object
+        <summary>Constructs a <c>SQLTransientException</c> object
             with a given
-            &lt;code&gt;reason&lt;/code&gt; and  &lt;code&gt;cause&lt;/code&gt;.</summary>
+            <c>reason</c> and  <c>cause</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -233,8 +233,8 @@
       <Docs>
         <param name="reason">a description of the exception</param>
         <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
-        <summary>Constructs a &lt;code&gt;SQLNonTransientException&lt;/code&gt; object
-            with a given &lt;code&gt;reason&lt;/code&gt; and &lt;code&gt;SQLState&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>SQLNonTransientException</c> object
+            with a given <c>reason</c> and <c>SQLState</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -274,11 +274,11 @@
       <Docs>
         <param name="reason">a description of the exception.</param>
         <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
-        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+        <param name="cause">the underlying reason for this <c>SQLException</c> (which is saved for later retrieval by the <c>getCause()</c> method); may be null indicating
                 the cause is non-existent or unknown.</param>
-        <summary>Constructs a &lt;code&gt;SQLNonTransientException&lt;/code&gt; object
+        <summary>Constructs a <c>SQLNonTransientException</c> object
             with a given
-            &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt; and  &lt;code&gt;cause&lt;/code&gt;.</summary>
+            <c>reason</c>, <c>SQLState</c> and  <c>cause</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -319,9 +319,9 @@
         <param name="reason">a description of the exception</param>
         <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
         <param name="vendorCode">a database vendor specific exception code</param>
-        <summary>Constructs a &lt;code&gt;SQLNonTransientException&lt;/code&gt; object
-            with a given &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt;  and
-            &lt;code&gt;vendorCode&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>SQLNonTransientException</c> object
+            with a given <c>reason</c>, <c>SQLState</c>  and
+            <c>vendorCode</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -363,12 +363,12 @@
         <param name="reason">a description of the exception</param>
         <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
         <param name="vendorCode">a database vendor-specific exception code</param>
-        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+        <param name="cause">the underlying reason for this <c>SQLException</c> (which is saved for later retrieval by the <c>getCause()</c> method); may be null indicating
                 the cause is non-existent or unknown.</param>
-        <summary>Constructs a &lt;code&gt;SQLNonTransientException&lt;/code&gt; object
+        <summary>Constructs a <c>SQLNonTransientException</c> object
             with a given
-            &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt;, &lt;code&gt;vendorCode&lt;/code&gt;
-            and  &lt;code&gt;cause&lt;/code&gt;.</summary>
+            <c>reason</c>, <c>SQLState</c>, <c>vendorCode</c>
+            and  <c>cause</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.Sql/SQLRecoverableException.xml b/docs/Mono.Android/en/Java.Sql/SQLRecoverableException.xml
index 5d06962789..7bc8c449b9 100644
--- a/docs/Mono.Android/en/Java.Sql/SQLRecoverableException.xml
+++ b/docs/Mono.Android/en/Java.Sql/SQLRecoverableException.xml
@@ -53,7 +53,7 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <summary>Constructs a &lt;code&gt;SQLRecoverableException&lt;/code&gt; object.</summary>
+        <summary>Constructs a <c>SQLRecoverableException</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -89,10 +89,10 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+        <param name="cause">the underlying reason for this <c>SQLException</c> (which is saved for later retrieval by the <c>getCause()</c> method); may be null indicating
                 the cause is non-existent or unknown.</param>
-        <summary>Constructs a &lt;code&gt;SQLRecoverableException&lt;/code&gt; object
-            with a given  &lt;code&gt;cause&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>SQLRecoverableException</c> object
+            with a given  <c>cause</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -129,8 +129,8 @@
       </Parameters>
       <Docs>
         <param name="reason">a description of the exception</param>
-        <summary>Constructs a &lt;code&gt;SQLRecoverableException&lt;/code&gt; object
-             with a given &lt;code&gt;reason&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>SQLRecoverableException</c> object
+             with a given <c>reason</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -191,11 +191,11 @@
       </Parameters>
       <Docs>
         <param name="reason">a description of the exception.</param>
-        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+        <param name="cause">the underlying reason for this <c>SQLException</c> (which is saved for later retrieval by the <c>getCause()</c> method); may be null indicating
                 the cause is non-existent or unknown.</param>
-        <summary>Constructs a &lt;code&gt;SQLRecoverableException&lt;/code&gt; object
+        <summary>Constructs a <c>SQLRecoverableException</c> object
             with a given
-            &lt;code&gt;reason&lt;/code&gt; and  &lt;code&gt;cause&lt;/code&gt;.</summary>
+            <c>reason</c> and  <c>cause</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -234,8 +234,8 @@
       <Docs>
         <param name="reason">a description of the exception</param>
         <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
-        <summary>Constructs a &lt;code&gt;SQLRecoverableException&lt;/code&gt; object
-            with a given &lt;code&gt;reason&lt;/code&gt; and &lt;code&gt;SQLState&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>SQLRecoverableException</c> object
+            with a given <c>reason</c> and <c>SQLState</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -275,11 +275,11 @@
       <Docs>
         <param name="reason">a description of the exception.</param>
         <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
-        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+        <param name="cause">the underlying reason for this <c>SQLException</c> (which is saved for later retrieval by the <c>getCause()</c> method); may be null indicating
                 the cause is non-existent or unknown.</param>
-        <summary>Constructs a &lt;code&gt;SQLRecoverableException&lt;/code&gt; object
+        <summary>Constructs a <c>SQLRecoverableException</c> object
             with a given
-            &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt; and  &lt;code&gt;cause&lt;/code&gt;.</summary>
+            <c>reason</c>, <c>SQLState</c> and  <c>cause</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -320,9 +320,9 @@
         <param name="reason">a description of the exception</param>
         <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
         <param name="vendorCode">a database vendor specific exception code</param>
-        <summary>Constructs a &lt;code&gt;SQLRecoverableException&lt;/code&gt; object
-             with a given &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt;  and
-            &lt;code&gt;vendorCode&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>SQLRecoverableException</c> object
+             with a given <c>reason</c>, <c>SQLState</c>  and
+            <c>vendorCode</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -364,12 +364,12 @@
         <param name="reason">a description of the exception</param>
         <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
         <param name="vendorCode">a database vendor-specific exception code</param>
-        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+        <param name="cause">the underlying reason for this <c>SQLException</c> (which is saved for later retrieval by the <c>getCause()</c> method); may be null indicating
                 the cause is non-existent or unknown.</param>
-        <summary>Constructs a &lt;code&gt;SQLRecoverableException&lt;/code&gt; object
+        <summary>Constructs a <c>SQLRecoverableException</c> object
             with a given
-            &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt;, &lt;code&gt;vendorCode&lt;/code&gt;
-            and  &lt;code&gt;cause&lt;/code&gt;.</summary>
+            <c>reason</c>, <c>SQLState</c>, <c>vendorCode</c>
+            and  <c>cause</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.Sql/SQLSyntaxErrorException.xml b/docs/Mono.Android/en/Java.Sql/SQLSyntaxErrorException.xml
index ad608109ea..1279613ff7 100644
--- a/docs/Mono.Android/en/Java.Sql/SQLSyntaxErrorException.xml
+++ b/docs/Mono.Android/en/Java.Sql/SQLSyntaxErrorException.xml
@@ -51,7 +51,7 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <summary>Constructs a &lt;code&gt;SQLSyntaxErrorException&lt;/code&gt; object.</summary>
+        <summary>Constructs a <c>SQLSyntaxErrorException</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -87,10 +87,10 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval bythe &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+        <param name="cause">the underlying reason for this <c>SQLException</c> (which is saved for later retrieval bythe <c>getCause()</c> method); may be null indicating
                 the cause is non-existent or unknown.</param>
-        <summary>Constructs a &lt;code&gt;SQLSyntaxErrorException&lt;/code&gt; object
-              with a given  &lt;code&gt;cause&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>SQLSyntaxErrorException</c> object
+              with a given  <c>cause</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -127,8 +127,8 @@
       </Parameters>
       <Docs>
         <param name="reason">a description of the exception</param>
-        <summary>Constructs a &lt;code&gt;SQLSyntaxErrorException&lt;/code&gt; object
-            with a given &lt;code&gt;reason&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>SQLSyntaxErrorException</c> object
+            with a given <c>reason</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -189,11 +189,11 @@
       </Parameters>
       <Docs>
         <param name="reason">a description of the exception.</param>
-        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+        <param name="cause">the underlying reason for this <c>SQLException</c> (which is saved for later retrieval by the <c>getCause()</c> method); may be null indicating
                 the cause is non-existent or unknown.</param>
-        <summary>Constructs a &lt;code&gt;SQLSyntaxErrorException&lt;/code&gt; object
+        <summary>Constructs a <c>SQLSyntaxErrorException</c> object
             with a given
-            &lt;code&gt;reason&lt;/code&gt; and  &lt;code&gt;cause&lt;/code&gt;.</summary>
+            <c>reason</c> and  <c>cause</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -232,8 +232,8 @@
       <Docs>
         <param name="reason">a description of the exception</param>
         <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
-        <summary>Constructs a &lt;code&gt;SQLSyntaxErrorException&lt;/code&gt; object
-            with a given &lt;code&gt;reason&lt;/code&gt; and &lt;code&gt;SQLState&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>SQLSyntaxErrorException</c> object
+            with a given <c>reason</c> and <c>SQLState</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -273,11 +273,11 @@
       <Docs>
         <param name="reason">a description of the exception.</param>
         <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
-        <param name="cause">the (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+        <param name="cause">the (which is saved for later retrieval by the <c>getCause()</c> method); may be null indicating
                 the cause is non-existent or unknown.</param>
-        <summary>Constructs a &lt;code&gt;SQLSyntaxErrorException&lt;/code&gt; object
+        <summary>Constructs a <c>SQLSyntaxErrorException</c> object
             with a given
-            &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt; and  &lt;code&gt;cause&lt;/code&gt;.</summary>
+            <c>reason</c>, <c>SQLState</c> and  <c>cause</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -318,9 +318,9 @@
         <param name="reason">a description of the exception</param>
         <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
         <param name="vendorCode">a database vendor specific exception code</param>
-        <summary>Constructs a &lt;code&gt;SQLSyntaxErrorException&lt;/code&gt; object
-             with a given &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt;  and
-            &lt;code&gt;vendorCode&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>SQLSyntaxErrorException</c> object
+             with a given <c>reason</c>, <c>SQLState</c>  and
+            <c>vendorCode</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -362,12 +362,12 @@
         <param name="reason">a description of the exception</param>
         <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
         <param name="vendorCode">a database vendor-specific exception code</param>
-        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+        <param name="cause">the underlying reason for this <c>SQLException</c> (which is saved for later retrieval by the <c>getCause()</c> method); may be null indicating
                 the cause is non-existent or unknown.</param>
-        <summary>Constructs a &lt;code&gt;SQLSyntaxErrorException&lt;/code&gt; object
+        <summary>Constructs a <c>SQLSyntaxErrorException</c> object
             with a given
-            &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt;, &lt;code&gt;vendorCode&lt;/code&gt;
-            and  &lt;code&gt;cause&lt;/code&gt;.</summary>
+            <c>reason</c>, <c>SQLState</c>, <c>vendorCode</c>
+            and  <c>cause</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.Sql/SQLTimeoutException.xml b/docs/Mono.Android/en/Java.Sql/SQLTimeoutException.xml
index 09e874c66f..959248fcd6 100644
--- a/docs/Mono.Android/en/Java.Sql/SQLTimeoutException.xml
+++ b/docs/Mono.Android/en/Java.Sql/SQLTimeoutException.xml
@@ -18,7 +18,7 @@
     </Attribute>
   </Attributes>
   <Docs since="9">
-    <summary>The subclass of <c>SQLException</c> thrown when the timeout specified by &lt;code&gt;Statement&lt;/code&gt;
+    <summary>The subclass of <c>SQLException</c> thrown when the timeout specified by <c>Statement</c>
              has expired.</summary>
     <remarks>
       <para>
@@ -51,7 +51,7 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <summary>Constructs a &lt;code&gt;SQLTimeoutException&lt;/code&gt; object.</summary>
+        <summary>Constructs a <c>SQLTimeoutException</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -87,10 +87,10 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+        <param name="cause">the underlying reason for this <c>SQLException</c> (which is saved for later retrieval by the <c>getCause()</c> method); may be null indicating
                 the cause is non-existent or unknown.</param>
-        <summary>Constructs a &lt;code&gt;SQLTimeoutException&lt;/code&gt; object
-            with a given  &lt;code&gt;cause&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>SQLTimeoutException</c> object
+            with a given  <c>cause</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -127,8 +127,8 @@
       </Parameters>
       <Docs>
         <param name="reason">a description of the exception</param>
-        <summary>Constructs a &lt;code&gt;SQLTimeoutException&lt;/code&gt; object
-            with a given &lt;code&gt;reason&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>SQLTimeoutException</c> object
+            with a given <c>reason</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -189,11 +189,11 @@
       </Parameters>
       <Docs>
         <param name="reason">a description of the exception.</param>
-        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+        <param name="cause">the underlying reason for this <c>SQLException</c> (which is saved for later retrieval by the <c>getCause()</c> method); may be null indicating
                 the cause is non-existent or unknown.</param>
-        <summary>Constructs a &lt;code&gt;SQLTimeoutException&lt;/code&gt; object
+        <summary>Constructs a <c>SQLTimeoutException</c> object
             with a given
-            &lt;code&gt;reason&lt;/code&gt; and  &lt;code&gt;cause&lt;/code&gt;.</summary>
+            <c>reason</c> and  <c>cause</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -232,8 +232,8 @@
       <Docs>
         <param name="reason">a description of the exception</param>
         <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
-        <summary>Constructs a &lt;code&gt;SQLTimeoutException&lt;/code&gt; object
-            with a given &lt;code&gt;reason&lt;/code&gt; and &lt;code&gt;SQLState&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>SQLTimeoutException</c> object
+            with a given <c>reason</c> and <c>SQLState</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -273,11 +273,11 @@
       <Docs>
         <param name="reason">a description of the exception.</param>
         <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
-        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+        <param name="cause">the underlying reason for this <c>SQLException</c> (which is saved for later retrieval by the <c>getCause()</c> method); may be null indicating
                 the cause is non-existent or unknown.</param>
-        <summary>Constructs a &lt;code&gt;SQLTimeoutException&lt;/code&gt; object
+        <summary>Constructs a <c>SQLTimeoutException</c> object
              with a given
-            &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt; and  &lt;code&gt;cause&lt;/code&gt;.</summary>
+            <c>reason</c>, <c>SQLState</c> and  <c>cause</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -318,9 +318,9 @@
         <param name="reason">a description of the exception</param>
         <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
         <param name="vendorCode">a database vendor specific exception code</param>
-        <summary>Constructs a &lt;code&gt;SQLTimeoutException&lt;/code&gt; object
-            with a given &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt;  and
-            &lt;code&gt;vendorCode&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>SQLTimeoutException</c> object
+            with a given <c>reason</c>, <c>SQLState</c>  and
+            <c>vendorCode</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -362,12 +362,12 @@
         <param name="reason">a description of the exception</param>
         <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
         <param name="vendorCode">a database vendor-specific exception code</param>
-        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+        <param name="cause">the underlying reason for this <c>SQLException</c> (which is saved for later retrieval by the <c>getCause()</c> method); may be null indicating
                 the cause is non-existent or unknown.</param>
-        <summary>Constructs a &lt;code&gt;SQLTimeoutException&lt;/code&gt; object
+        <summary>Constructs a <c>SQLTimeoutException</c> object
             with a given
-            &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt;, &lt;code&gt;vendorCode&lt;/code&gt;
-            and  &lt;code&gt;cause&lt;/code&gt;.</summary>
+            <c>reason</c>, <c>SQLState</c>, <c>vendorCode</c>
+            and  <c>cause</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.Sql/SQLTransactionRollbackException.xml b/docs/Mono.Android/en/Java.Sql/SQLTransactionRollbackException.xml
index 730dcd7839..fba6a2e59f 100644
--- a/docs/Mono.Android/en/Java.Sql/SQLTransactionRollbackException.xml
+++ b/docs/Mono.Android/en/Java.Sql/SQLTransactionRollbackException.xml
@@ -51,7 +51,7 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <summary>Constructs a &lt;code&gt;SQLTransactionRollbackException&lt;/code&gt; object.</summary>
+        <summary>Constructs a <c>SQLTransactionRollbackException</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -87,10 +87,10 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+        <param name="cause">the underlying reason for this <c>SQLException</c> (which is saved for later retrieval by the <c>getCause()</c> method); may be null indicating
                 the cause is non-existent or unknown.</param>
-        <summary>Constructs a &lt;code&gt;SQLTransactionRollbackException&lt;/code&gt; object
-            with a given  &lt;code&gt;cause&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>SQLTransactionRollbackException</c> object
+            with a given  <c>cause</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -127,8 +127,8 @@
       </Parameters>
       <Docs>
         <param name="reason">a description of the exception</param>
-        <summary>Constructs a &lt;code&gt;SQLTransactionRollbackException&lt;/code&gt; object
-            with a given &lt;code&gt;reason&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>SQLTransactionRollbackException</c> object
+            with a given <c>reason</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -189,11 +189,11 @@
       </Parameters>
       <Docs>
         <param name="reason">a description of the exception.</param>
-        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+        <param name="cause">the underlying reason for this <c>SQLException</c> (which is saved for later retrieval by the <c>getCause()</c> method); may be null indicating
                 the cause is non-existent or unknown.</param>
-        <summary>Constructs a &lt;code&gt;SQLTransactionRollbackException&lt;/code&gt; object
+        <summary>Constructs a <c>SQLTransactionRollbackException</c> object
             with a given
-            &lt;code&gt;reason&lt;/code&gt; and  &lt;code&gt;cause&lt;/code&gt;.</summary>
+            <c>reason</c> and  <c>cause</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -232,8 +232,8 @@
       <Docs>
         <param name="reason">a description of the exception</param>
         <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
-        <summary>Constructs a &lt;code&gt;SQLTransactionRollbackException&lt;/code&gt; object
-            with a given &lt;code&gt;reason&lt;/code&gt; and &lt;code&gt;SQLState&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>SQLTransactionRollbackException</c> object
+            with a given <c>reason</c> and <c>SQLState</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -273,11 +273,11 @@
       <Docs>
         <param name="reason">a description of the exception.</param>
         <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
-        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+        <param name="cause">the underlying reason for this <c>SQLException</c> (which is saved for later retrieval by the <c>getCause()</c> method); may be null indicating
                 the cause is non-existent or unknown.</param>
-        <summary>Constructs a &lt;code&gt;SQLTransactionRollbackException&lt;/code&gt; object
+        <summary>Constructs a <c>SQLTransactionRollbackException</c> object
             with a given
-            &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt; and  &lt;code&gt;cause&lt;/code&gt;.</summary>
+            <c>reason</c>, <c>SQLState</c> and  <c>cause</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -318,9 +318,9 @@
         <param name="reason">a description of the exception</param>
         <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
         <param name="vendorCode">a database vendor specific exception code</param>
-        <summary>Constructs a &lt;code&gt;SQLTransactionRollbackException&lt;/code&gt; object
-            with a given &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt;  and
-            &lt;code&gt;vendorCode&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>SQLTransactionRollbackException</c> object
+            with a given <c>reason</c>, <c>SQLState</c>  and
+            <c>vendorCode</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -362,12 +362,12 @@
         <param name="reason">a description of the exception</param>
         <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
         <param name="vendorCode">a database vendor-specific exception code</param>
-        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+        <param name="cause">the underlying reason for this <c>SQLException</c> (which is saved for later retrieval by the <c>getCause()</c> method); may be null indicating
                 the cause is non-existent or unknown.</param>
-        <summary>Constructs a &lt;code&gt;SQLTransactionRollbackException&lt;/code&gt; object
+        <summary>Constructs a <c>SQLTransactionRollbackException</c> object
             with a given
-            &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt;, &lt;code&gt;vendorCode&lt;/code&gt;
-            and  &lt;code&gt;cause&lt;/code&gt;.</summary>
+            <c>reason</c>, <c>SQLState</c>, <c>vendorCode</c>
+            and  <c>cause</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.Sql/SQLTransientConnectionException.xml b/docs/Mono.Android/en/Java.Sql/SQLTransientConnectionException.xml
index bc757e981b..78a7876bbc 100644
--- a/docs/Mono.Android/en/Java.Sql/SQLTransientConnectionException.xml
+++ b/docs/Mono.Android/en/Java.Sql/SQLTransientConnectionException.xml
@@ -51,7 +51,7 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <summary>Constructs a &lt;code&gt;SQLTransientConnectionException&lt;/code&gt; object.</summary>
+        <summary>Constructs a <c>SQLTransientConnectionException</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -87,10 +87,10 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+        <param name="cause">the underlying reason for this <c>SQLException</c> (which is saved for later retrieval by the <c>getCause()</c> method); may be null indicating
                 the cause is non-existent or unknown.</param>
-        <summary>Constructs a &lt;code&gt;SQLTransientConnectionException&lt;/code&gt; object
-            with a given  &lt;code&gt;cause&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>SQLTransientConnectionException</c> object
+            with a given  <c>cause</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -127,8 +127,8 @@
       </Parameters>
       <Docs>
         <param name="reason">a description of the exception</param>
-        <summary>Constructs a &lt;code&gt;SQLTransientConnectionException&lt;/code&gt; object
-            with a given &lt;code&gt;reason&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>SQLTransientConnectionException</c> object
+            with a given <c>reason</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -189,11 +189,11 @@
       </Parameters>
       <Docs>
         <param name="reason">a description of the exception.</param>
-        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt;(which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+        <param name="cause">the underlying reason for this <c>SQLException</c>(which is saved for later retrieval by the <c>getCause()</c> method); may be null indicating
                 the cause is non-existent or unknown.</param>
-        <summary>Constructs a &lt;code&gt;SQLTransientConnectionException&lt;/code&gt; object
+        <summary>Constructs a <c>SQLTransientConnectionException</c> object
             with a given
-            &lt;code&gt;reason&lt;/code&gt; and  &lt;code&gt;cause&lt;/code&gt;.</summary>
+            <c>reason</c> and  <c>cause</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -232,8 +232,8 @@
       <Docs>
         <param name="reason">a description of the exception</param>
         <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
-        <summary>Constructs a &lt;code&gt;SQLTransientConnectionException&lt;/code&gt; object
-            with a given &lt;code&gt;reason&lt;/code&gt; and &lt;code&gt;SQLState&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>SQLTransientConnectionException</c> object
+            with a given <c>reason</c> and <c>SQLState</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -273,11 +273,11 @@
       <Docs>
         <param name="reason">a description of the exception.</param>
         <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
-        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+        <param name="cause">the underlying reason for this <c>SQLException</c> (which is saved for later retrieval by the <c>getCause()</c> method); may be null indicating
                 the cause is non-existent or unknown.</param>
-        <summary>Constructs a &lt;code&gt;SQLTransientConnectionException&lt;/code&gt; object
+        <summary>Constructs a <c>SQLTransientConnectionException</c> object
             with a given
-            &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt; and  &lt;code&gt;cause&lt;/code&gt;.</summary>
+            <c>reason</c>, <c>SQLState</c> and  <c>cause</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -318,9 +318,9 @@
         <param name="reason">a description of the exception</param>
         <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
         <param name="vendorCode">a database vendor specific exception code</param>
-        <summary>Constructs a &lt;code&gt;SQLTransientConnectionException&lt;/code&gt; object
-            with a given &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt;  and
-            &lt;code&gt;vendorCode&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>SQLTransientConnectionException</c> object
+            with a given <c>reason</c>, <c>SQLState</c>  and
+            <c>vendorCode</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -362,12 +362,12 @@
         <param name="reason">a description of the exception</param>
         <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
         <param name="vendorCode">a database vendor-specific exception code</param>
-        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+        <param name="cause">the underlying reason for this <c>SQLException</c> (which is saved for later retrieval by the <c>getCause()</c> method); may be null indicating
                 the cause is non-existent or unknown.</param>
-        <summary>Constructs a &lt;code&gt;SQLTransientConnectionException&lt;/code&gt; object
+        <summary>Constructs a <c>SQLTransientConnectionException</c> object
             with a given
-            &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt;, &lt;code&gt;vendorCode&lt;/code&gt;
-            and  &lt;code&gt;cause&lt;/code&gt;.</summary>
+            <c>reason</c>, <c>SQLState</c>, <c>vendorCode</c>
+            and  <c>cause</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.Sql/SQLTransientException.xml b/docs/Mono.Android/en/Java.Sql/SQLTransientException.xml
index 923dff37ed..5087dc19ac 100644
--- a/docs/Mono.Android/en/Java.Sql/SQLTransientException.xml
+++ b/docs/Mono.Android/en/Java.Sql/SQLTransientException.xml
@@ -52,7 +52,7 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <summary>Constructs a &lt;code&gt;SQLTransientException&lt;/code&gt; object.</summary>
+        <summary>Constructs a <c>SQLTransientException</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -88,10 +88,10 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+        <param name="cause">the underlying reason for this <c>SQLException</c> (which is saved for later retrieval by the <c>getCause()</c> method); may be null indicating
                 the cause is non-existent or unknown.</param>
-        <summary>Constructs a &lt;code&gt;SQLTransientException&lt;/code&gt; object
-            with a given  &lt;code&gt;cause&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>SQLTransientException</c> object
+            with a given  <c>cause</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -128,8 +128,8 @@
       </Parameters>
       <Docs>
         <param name="reason">a description of the exception</param>
-        <summary>Constructs a &lt;code&gt;SQLTransientException&lt;/code&gt; object
-             with a given &lt;code&gt;reason&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>SQLTransientException</c> object
+             with a given <c>reason</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -190,11 +190,11 @@
       </Parameters>
       <Docs>
         <param name="reason">a description of the exception.</param>
-        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+        <param name="cause">the underlying reason for this <c>SQLException</c> (which is saved for later retrieval by the <c>getCause()</c> method); may be null indicating
                 the cause is non-existent or unknown.</param>
-        <summary>Constructs a &lt;code&gt;SQLTransientException&lt;/code&gt; object
+        <summary>Constructs a <c>SQLTransientException</c> object
             with a given
-            &lt;code&gt;reason&lt;/code&gt; and  &lt;code&gt;cause&lt;/code&gt;.</summary>
+            <c>reason</c> and  <c>cause</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -233,8 +233,8 @@
       <Docs>
         <param name="reason">a description of the exception</param>
         <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
-        <summary>Constructs a &lt;code&gt;SQLTransientException&lt;/code&gt; object
-            with a given &lt;code&gt;reason&lt;/code&gt; and &lt;code&gt;SQLState&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>SQLTransientException</c> object
+            with a given <c>reason</c> and <c>SQLState</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -274,11 +274,11 @@
       <Docs>
         <param name="reason">a description of the exception.</param>
         <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
-        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+        <param name="cause">the underlying reason for this <c>SQLException</c> (which is saved for later retrieval by the <c>getCause()</c> method); may be null indicating
                 the cause is non-existent or unknown.</param>
-        <summary>Constructs a &lt;code&gt;SQLTransientException&lt;/code&gt; object
+        <summary>Constructs a <c>SQLTransientException</c> object
             with a given
-            &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt; and  &lt;code&gt;cause&lt;/code&gt;.</summary>
+            <c>reason</c>, <c>SQLState</c> and  <c>cause</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -319,9 +319,9 @@
         <param name="reason">a description of the exception</param>
         <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
         <param name="vendorCode">a database vendor specific exception code</param>
-        <summary>Constructs a &lt;code&gt;SQLTransientException&lt;/code&gt; object
-             with a given &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt;  and
-            &lt;code&gt;vendorCode&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>SQLTransientException</c> object
+             with a given <c>reason</c>, <c>SQLState</c>  and
+            <c>vendorCode</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -363,12 +363,12 @@
         <param name="reason">a description of the exception</param>
         <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
         <param name="vendorCode">a database vendor-specific exception code</param>
-        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+        <param name="cause">the underlying reason for this <c>SQLException</c> (which is saved for later retrieval by the <c>getCause()</c> method); may be null indicating
                 the cause is non-existent or unknown.</param>
-        <summary>Constructs a &lt;code&gt;SQLTransientException&lt;/code&gt; object
+        <summary>Constructs a <c>SQLTransientException</c> object
             with a given
-            &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt;, &lt;code&gt;vendorCode&lt;/code&gt;
-            and  &lt;code&gt;cause&lt;/code&gt;.</summary>
+            <c>reason</c>, <c>SQLState</c>, <c>vendorCode</c>
+            and  <c>cause</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.Sql/SQLWarning.xml b/docs/Mono.Android/en/Java.Sql/SQLWarning.xml
index 5706106672..8a6518b241 100644
--- a/docs/Mono.Android/en/Java.Sql/SQLWarning.xml
+++ b/docs/Mono.Android/en/Java.Sql/SQLWarning.xml
@@ -65,7 +65,7 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <summary>Constructs a  &lt;code&gt;SQLWarning&lt;/code&gt; object.</summary>
+        <summary>Constructs a  <c>SQLWarning</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -101,10 +101,10 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">the underlying reason for this &lt;code&gt;SQLWarning&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+        <param name="cause">the underlying reason for this <c>SQLWarning</c> (which is saved for later retrieval by the <c>getCause()</c> method); may be null indicating
                 the cause is non-existent or unknown.</param>
-        <summary>Constructs a &lt;code&gt;SQLWarning&lt;/code&gt; object
-            with a given  &lt;code&gt;cause&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>SQLWarning</c> object
+            with a given  <c>cause</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -141,8 +141,8 @@
       </Parameters>
       <Docs>
         <param name="reason">a description of the warning</param>
-        <summary>Constructs a &lt;code&gt;SQLWarning&lt;/code&gt; object
-            with a given &lt;code&gt;reason&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>SQLWarning</c> object
+            with a given <c>reason</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -203,12 +203,12 @@
       </Parameters>
       <Docs>
         <param name="reason">a description of the warning</param>
-        <param name="cause">the underlying reason for this &lt;code&gt;SQLWarning&lt;/code&gt;
-            (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method);
+        <param name="cause">the underlying reason for this <c>SQLWarning</c>
+            (which is saved for later retrieval by the <c>getCause()</c> method);
             may be null indicating the cause is non-existent or unknown.</param>
-        <summary>Constructs a &lt;code&gt;SQLWarning&lt;/code&gt; object
+        <summary>Constructs a <c>SQLWarning</c> object
             with a given
-            &lt;code&gt;reason&lt;/code&gt; and  &lt;code&gt;cause&lt;/code&gt;.</summary>
+            <c>reason</c> and  <c>cause</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -247,8 +247,8 @@
       <Docs>
         <param name="reason">a description of the warning</param>
         <param name="SQLState">an XOPEN or SQL:2003 code identifying the warning</param>
-        <summary>Constructs a &lt;code&gt;SQLWarning&lt;/code&gt; object
-            with a given &lt;code&gt;reason&lt;/code&gt; and &lt;code&gt;SQLState&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>SQLWarning</c> object
+            with a given <c>reason</c> and <c>SQLState</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -288,11 +288,11 @@
       <Docs>
         <param name="reason">a description of the warning</param>
         <param name="SQLState">an XOPEN or SQL:2003 code identifying the warning</param>
-        <param name="cause">the underlying reason for this &lt;code&gt;SQLWarning&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+        <param name="cause">the underlying reason for this <c>SQLWarning</c> (which is saved for later retrieval by the <c>getCause()</c> method); may be null indicating
                 the cause is non-existent or unknown.</param>
-        <summary>Constructs a &lt;code&gt;SQLWarning&lt;/code&gt; object
+        <summary>Constructs a <c>SQLWarning</c> object
             with a given
-            &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt; and  &lt;code&gt;cause&lt;/code&gt;.</summary>
+            <c>reason</c>, <c>SQLState</c> and  <c>cause</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -333,9 +333,9 @@
         <param name="reason">a description of the warning</param>
         <param name="SQLState">an XOPEN or SQL:2003 code identifying the warning</param>
         <param name="vendorCode">a database vendor-specific warning code</param>
-        <summary>Constructs a  &lt;code&gt;SQLWarning&lt;/code&gt; object
-             with a given &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt;  and
-            &lt;code&gt;vendorCode&lt;/code&gt;.</summary>
+        <summary>Constructs a  <c>SQLWarning</c> object
+             with a given <c>reason</c>, <c>SQLState</c>  and
+            <c>vendorCode</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -377,12 +377,12 @@
         <param name="reason">a description of the warning</param>
         <param name="SQLState">an XOPEN or SQL:2003 code identifying the warning</param>
         <param name="vendorCode">a database vendor-specific warning code</param>
-        <param name="cause">the underlying reason for this &lt;code&gt;SQLWarning&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+        <param name="cause">the underlying reason for this <c>SQLWarning</c> (which is saved for later retrieval by the <c>getCause()</c> method); may be null indicating
                 the cause is non-existent or unknown.</param>
-        <summary>Constructs a&lt;code&gt;SQLWarning&lt;/code&gt; object
+        <summary>Constructs a<c>SQLWarning</c> object
             with a given
-            &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt;, &lt;code&gt;vendorCode&lt;/code&gt;
-            and  &lt;code&gt;cause&lt;/code&gt;.</summary>
+            <c>reason</c>, <c>SQLState</c>, <c>vendorCode</c>
+            and  <c>cause</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -456,10 +456,10 @@
         <ReturnType>Java.Sql.SQLWarning</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="w">the new end of the &lt;code&gt;SQLException&lt;/code&gt; chain</param>
-        <summary>Retrieves the warning chained to this &lt;code&gt;SQLWarning&lt;/code&gt; object by
-            &lt;code&gt;setNextWarning&lt;/code&gt;. -or- Adds a &lt;code&gt;SQLWarning&lt;/code&gt; object to the end of the chain.</summary>
-        <value>the next &lt;code&gt;SQLException&lt;/code&gt; in the chain; &lt;code&gt;null&lt;/code&gt; if none</value>
+        <param name="w">the new end of the <c>SQLException</c> chain</param>
+        <summary>Retrieves the warning chained to this <c>SQLWarning</c> object by
+            <c>setNextWarning</c>. -or- Adds a <c>SQLWarning</c> object to the end of the chain.</summary>
+        <value>the next <c>SQLException</c> in the chain; <c>null</c> if none</value>
         <remarks>
           <para>Property getter documentation:</para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Sql/Statement.xml b/docs/Mono.Android/en/Java.Sql/Statement.xml
index 53671e1027..b20aa14b44 100644
--- a/docs/Mono.Android/en/Java.Sql/Statement.xml
+++ b/docs/Mono.Android/en/Java.Sql/Statement.xml
@@ -59,9 +59,9 @@
       </ReturnValue>
       <MemberValue>3</MemberValue>
       <Docs>
-        <summary>The constant indicating that all &lt;code&gt;ResultSet&lt;/code&gt; objects that
+        <summary>The constant indicating that all <c>ResultSet</c> objects that
             have previously been kept open should be closed when calling
-            &lt;code&gt;getMoreResults&lt;/code&gt;.</summary>
+            <c>getMoreResults</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -102,8 +102,8 @@
       </ReturnValue>
       <MemberValue>1</MemberValue>
       <Docs>
-        <summary>The constant indicating that the current &lt;code&gt;ResultSet&lt;/code&gt; object
-            should be closed when calling &lt;code&gt;getMoreResults&lt;/code&gt;.</summary>
+        <summary>The constant indicating that the current <c>ResultSet</c> object
+            should be closed when calling <c>getMoreResults</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -186,8 +186,8 @@
       </ReturnValue>
       <MemberValue>2</MemberValue>
       <Docs>
-        <summary>The constant indicating that the current &lt;code&gt;ResultSet&lt;/code&gt; object
-            should not be closed when calling &lt;code&gt;getMoreResults&lt;/code&gt;.</summary>
+        <summary>The constant indicating that the current <c>ResultSet</c> object
+            should not be closed when calling <c>getMoreResults</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.Sql/Time.xml b/docs/Mono.Android/en/Java.Sql/Time.xml
index 7470e5c1e8..f24f842156 100644
--- a/docs/Mono.Android/en/Java.Sql/Time.xml
+++ b/docs/Mono.Android/en/Java.Sql/Time.xml
@@ -18,7 +18,8 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>A thin wrapper around the &lt;code&gt;java.</summary>
+    <summary>A thin wrapper around the <c>java.util.Date</c> class that allows the JDBC
+            API to identify this as an SQL <c>TIME</c> value.</summary>
     <remarks>
       <para>
         <format type="text/html">
@@ -57,7 +58,7 @@
         <param name="time">milliseconds since January 1, 1970, 00:00:00 GMT;
                         a negative number is milliseconds before
                           January 1, 1970, 00:00:00 GMT</param>
-        <summary>Constructs a &lt;code&gt;Time&lt;/code&gt; object using a milliseconds time value.</summary>
+        <summary>Constructs a <c>Time</c> object using a milliseconds time value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -125,7 +126,7 @@
         <param name="hour">0 to 23</param>
         <param name="minute">0 to 59</param>
         <param name="second">0 to 59</param>
-        <summary>Constructs a &lt;code&gt;Time&lt;/code&gt; object initialized with the
+        <summary>Constructs a <c>Time</c> object initialized with the
             given values for the hour, minute, and second.</summary>
         <remarks>
           <para>
@@ -259,8 +260,8 @@
       </Parameters>
       <Docs>
         <param name="s">time in format "hh:mm:ss"</param>
-        <summary>Converts a string in JDBC time escape format to a &lt;code&gt;Time&lt;/code&gt; value.</summary>
-        <returns>a corresponding &lt;code&gt;Time&lt;/code&gt; object</returns>
+        <summary>Converts a string in JDBC time escape format to a <c>Time</c> value.</summary>
+        <returns>a corresponding <c>Time</c> object</returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.Sql/Timestamp.xml b/docs/Mono.Android/en/Java.Sql/Timestamp.xml
index a029fd7127..233e1dd916 100644
--- a/docs/Mono.Android/en/Java.Sql/Timestamp.xml
+++ b/docs/Mono.Android/en/Java.Sql/Timestamp.xml
@@ -18,7 +18,8 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>A thin wrapper around &lt;code&gt;java.</summary>
+    <summary>A thin wrapper around <c>java.util.Date</c> that allows
+            the JDBC API to identify this as an SQL <c>TIMESTAMP</c> value.</summary>
     <remarks>
       <para>
         <format type="text/html">
@@ -57,7 +58,7 @@
         <param name="time">milliseconds since January 1, 1970, 00:00:00 GMT.
                    A negative number is the number of milliseconds before
                     January 1, 1970, 00:00:00 GMT.</param>
-        <summary>Constructs a &lt;code&gt;Timestamp&lt;/code&gt; object
+        <summary>Constructs a <c>Timestamp</c> object
             using a milliseconds time value.</summary>
         <remarks>
           <para>
@@ -134,7 +135,7 @@
         <param name="minute">0 to 59</param>
         <param name="second">0 to 59</param>
         <param name="nano">0 to 999,999,999</param>
-        <summary>Constructs a &lt;code&gt;Timestamp&lt;/code&gt; object initialized
+        <summary>Constructs a <c>Timestamp</c> object initialized
             with the given values.</summary>
         <remarks>
           <para>
@@ -176,11 +177,12 @@
         <Parameter Name="ts" Type="Java.Sql.Timestamp" />
       </Parameters>
       <Docs>
-        <param name="ts">the &lt;code&gt;Timestamp&lt;/code&gt; value to compare with</param>
-        <summary>Indicates whether this &lt;code&gt;Timestamp&lt;/code&gt; object is
-            later than the given &lt;code&gt;Timestamp&lt;/code&gt; object.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if this &lt;code&gt;Timestamp&lt;/code&gt; object is later;
-                   &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <param name="ts">the <c>Timestamp</c> value to compare with</param>
+        <summary>Indicates whether this <c>Timestamp</c> object is
+            later than the given <c>Timestamp</c> object.</summary>
+        <returns>
+          <c>true</c> if this <c>Timestamp</c> object is later;
+                   <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -219,11 +221,12 @@
         <Parameter Name="ts" Type="Java.Sql.Timestamp" />
       </Parameters>
       <Docs>
-        <param name="ts">the &lt;code&gt;Timestamp&lt;/code&gt; value to compare with</param>
-        <summary>Indicates whether this &lt;code&gt;Timestamp&lt;/code&gt; object is
-            earlier than the given &lt;code&gt;Timestamp&lt;/code&gt; object.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if this &lt;code&gt;Timestamp&lt;/code&gt; object is earlier;
-                   &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <param name="ts">the <c>Timestamp</c> value to compare with</param>
+        <summary>Indicates whether this <c>Timestamp</c> object is
+            earlier than the given <c>Timestamp</c> object.</summary>
+        <returns>
+          <c>true</c> if this <c>Timestamp</c> object is earlier;
+                   <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -262,15 +265,15 @@
         <Parameter Name="ts" Type="Java.Sql.Timestamp" />
       </Parameters>
       <Docs>
-        <param name="ts">the &lt;code&gt;Timestamp&lt;/code&gt; object to be compared to
-                           this &lt;code&gt;Timestamp&lt;/code&gt; object</param>
-        <summary>Compares this &lt;code&gt;Timestamp&lt;/code&gt; object to the given
-            &lt;code&gt;Timestamp&lt;/code&gt; object.</summary>
-        <returns>the value &lt;code&gt;0&lt;/code&gt; if the two &lt;code&gt;Timestamp&lt;/code&gt;
-                     objects are equal; a value less than &lt;code&gt;0&lt;/code&gt; if this
-                     &lt;code&gt;Timestamp&lt;/code&gt; object is before the given argument;
-                     and a value greater than &lt;code&gt;0&lt;/code&gt; if this
-                     &lt;code&gt;Timestamp&lt;/code&gt; object is after the given argument.</returns>
+        <param name="ts">the <c>Timestamp</c> object to be compared to
+                           this <c>Timestamp</c> object</param>
+        <summary>Compares this <c>Timestamp</c> object to the given
+            <c>Timestamp</c> object.</summary>
+        <returns>the value <c>0</c> if the two <c>Timestamp</c>
+                     objects are equal; a value less than <c>0</c> if this
+                     <c>Timestamp</c> object is before the given argument;
+                     and a value greater than <c>0</c> if this
+                     <c>Timestamp</c> object is after the given argument.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -309,12 +312,13 @@
         <Parameter Name="ts" Type="Java.Sql.Timestamp" />
       </Parameters>
       <Docs>
-        <param name="ts">the &lt;code&gt;Timestamp&lt;/code&gt; value to compare with</param>
-        <summary>Tests to see if this &lt;code&gt;Timestamp&lt;/code&gt; object is
-            equal to the given &lt;code&gt;Timestamp&lt;/code&gt; object.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if the given &lt;code&gt;Timestamp&lt;/code&gt;
-                    object is equal to this &lt;code&gt;Timestamp&lt;/code&gt; object;
-                    &lt;code&gt;false&lt;/code&gt; otherwise</returns>
+        <param name="ts">the <c>Timestamp</c> value to compare with</param>
+        <summary>Tests to see if this <c>Timestamp</c> object is
+            equal to the given <c>Timestamp</c> object.</summary>
+        <returns>
+          <c>true</c> if the given <c>Timestamp</c>
+                    object is equal to this <c>Timestamp</c> object;
+                    <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -386,9 +390,9 @@
       </ReturnValue>
       <Docs>
         <param name="n">the new fractional seconds component</param>
-        <summary>Gets this &lt;code&gt;Timestamp&lt;/code&gt; object's &lt;code&gt;nanos&lt;/code&gt; value. -or- Sets this &lt;code&gt;Timestamp&lt;/code&gt; object's &lt;code&gt;nanos&lt;/code&gt; field
+        <summary>Gets this <c>Timestamp</c> object's <c>nanos</c> value. -or- Sets this <c>Timestamp</c> object's <c>nanos</c> field
             to the given value.</summary>
-        <value>this &lt;code&gt;Timestamp&lt;/code&gt; object's fractional seconds component</value>
+        <value>this <c>Timestamp</c> object's fractional seconds component</value>
         <remarks>
           <para>Property getter documentation:</para>
           <para>
@@ -514,12 +518,12 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">timestamp in format &lt;code&gt;yyyy-[m]m-[d]d hh:mm:ss[.f...]&lt;/code&gt;.  The
-            fractional seconds may be omitted. The leading zero for &lt;code&gt;mm&lt;/code&gt;
-            and &lt;code&gt;dd&lt;/code&gt; may also be omitted.</param>
-        <summary>Converts a &lt;code&gt;String&lt;/code&gt; object in JDBC timestamp escape format to a
-            &lt;code&gt;Timestamp&lt;/code&gt; value.</summary>
-        <returns>corresponding &lt;code&gt;Timestamp&lt;/code&gt; value</returns>
+        <param name="s">timestamp in format <c>yyyy-[m]m-[d]d hh:mm:ss[.f...]</c>.  The
+            fractional seconds may be omitted. The leading zero for <c>mm</c>
+            and <c>dd</c> may also be omitted.</param>
+        <summary>Converts a <c>String</c> object in JDBC timestamp escape format to a
+            <c>Timestamp</c> value.</summary>
+        <returns>corresponding <c>Timestamp</c> value</returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.Sql/Types.xml b/docs/Mono.Android/en/Java.Sql/Types.xml
index 2f8684f260..e0d8097aa4 100644
--- a/docs/Mono.Android/en/Java.Sql/Types.xml
+++ b/docs/Mono.Android/en/Java.Sql/Types.xml
@@ -81,7 +81,7 @@
       <Docs>
         <summary>The constant in the Java programming language, sometimes referred to
             as a type code, that identifies the generic SQL type
-            &lt;code&gt;ARRAY&lt;/code&gt;.</summary>
+            <c>ARRAY</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -120,7 +120,7 @@
       <Docs>
         <summary>The constant in the Java programming language, sometimes referred
             to as a type code, that identifies the generic SQL type
-            &lt;code&gt;BIGINT&lt;/code&gt;.</summary>
+            <c>BIGINT</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -159,7 +159,7 @@
       <Docs>
         <summary>The constant in the Java programming language, sometimes referred
             to as a type code, that identifies the generic SQL type
-            &lt;code&gt;BINARY&lt;/code&gt;.</summary>
+            <c>BINARY</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -198,7 +198,7 @@
       <Docs>
         <summary>The constant in the Java programming language, sometimes referred
             to as a type code, that identifies the generic SQL type
-            &lt;code&gt;BIT&lt;/code&gt;.</summary>
+            <c>BIT</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -237,7 +237,7 @@
       <Docs>
         <summary>The constant in the Java programming language, sometimes referred to
             as a type code, that identifies the generic SQL type
-            &lt;code&gt;BLOB&lt;/code&gt;.</summary>
+            <c>BLOB</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -275,7 +275,7 @@
       <MemberValue>16</MemberValue>
       <Docs>
         <summary>The constant in the Java programming language, somtimes referred to
-            as a type code, that identifies the generic SQL type &lt;code&gt;BOOLEAN&lt;/code&gt;.</summary>
+            as a type code, that identifies the generic SQL type <c>BOOLEAN</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -314,7 +314,7 @@
       <Docs>
         <summary>The constant in the Java programming language, sometimes referred
             to as a type code, that identifies the generic SQL type
-            &lt;code&gt;CHAR&lt;/code&gt;.</summary>
+            <c>CHAR</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -353,7 +353,7 @@
       <Docs>
         <summary>The constant in the Java programming language, sometimes referred to
             as a type code, that identifies the generic SQL type
-            &lt;code&gt;CLOB&lt;/code&gt;.</summary>
+            <c>CLOB</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -391,7 +391,7 @@
       <MemberValue>70</MemberValue>
       <Docs>
         <summary>The constant in the Java programming language, somtimes referred to
-            as a type code, that identifies the generic SQL type &lt;code&gt;DATALINK&lt;/code&gt;.</summary>
+            as a type code, that identifies the generic SQL type <c>DATALINK</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -430,7 +430,7 @@
       <Docs>
         <summary>The constant in the Java programming language, sometimes referred
             to as a type code, that identifies the generic SQL type
-            &lt;code&gt;DATE&lt;/code&gt;.</summary>
+            <c>DATE</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -469,7 +469,7 @@
       <Docs>
         <summary>The constant in the Java programming language, sometimes referred
             to as a type code, that identifies the generic SQL type
-            &lt;code&gt;DECIMAL&lt;/code&gt;.</summary>
+            <c>DECIMAL</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -508,7 +508,7 @@
       <Docs>
         <summary>The constant in the Java programming language, sometimes referred to
             as a type code, that identifies the generic SQL type
-            &lt;code&gt;DISTINCT&lt;/code&gt;.</summary>
+            <c>DISTINCT</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -547,7 +547,7 @@
       <Docs>
         <summary>The constant in the Java programming language, sometimes referred
             to as a type code, that identifies the generic SQL type
-            &lt;code&gt;DOUBLE&lt;/code&gt;.</summary>
+            <c>DOUBLE</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -586,7 +586,7 @@
       <Docs>
         <summary>The constant in the Java programming language, sometimes referred
             to as a type code, that identifies the generic SQL type
-            &lt;code&gt;FLOAT&lt;/code&gt;.</summary>
+            <c>FLOAT</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -625,7 +625,7 @@
       <Docs>
         <summary>The constant in the Java programming language, sometimes referred
             to as a type code, that identifies the generic SQL type
-            &lt;code&gt;INTEGER&lt;/code&gt;.</summary>
+            <c>INTEGER</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -664,7 +664,7 @@
       <Docs>
         <summary>The constant in the Java programming language, sometimes referred to
             as a type code, that identifies the generic SQL type
-            &lt;code&gt;JAVA_OBJECT&lt;/code&gt;.</summary>
+            <c>JAVA_OBJECT</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -733,7 +733,7 @@
       <MemberValue>-16</MemberValue>
       <Docs>
         <summary>The constant in the Java programming language, sometimes referred to
-            as a type code, that identifies the generic SQL type &lt;code&gt;LONGNVARCHAR&lt;/code&gt;.</summary>
+            as a type code, that identifies the generic SQL type <c>LONGNVARCHAR</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -771,7 +771,7 @@
       <Docs>
         <summary>The constant in the Java programming language, sometimes referred
             to as a type code, that identifies the generic SQL type
-            &lt;code&gt;LONGVARBINARY&lt;/code&gt;.</summary>
+            <c>LONGVARBINARY</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -810,7 +810,7 @@
       <Docs>
         <summary>The constant in the Java programming language, sometimes referred
             to as a type code, that identifies the generic SQL type
-            &lt;code&gt;LONGVARCHAR&lt;/code&gt;.</summary>
+            <c>LONGVARCHAR</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -848,7 +848,7 @@
       <MemberValue>-15</MemberValue>
       <Docs>
         <summary>The constant in the Java programming language, sometimes referred to
-            as a type code, that identifies the generic SQL type &lt;code&gt;NCHAR&lt;/code&gt;</summary>
+            as a type code, that identifies the generic SQL type <c>NCHAR</c></summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -885,7 +885,7 @@
       <MemberValue>2011</MemberValue>
       <Docs>
         <summary>The constant in the Java programming language, sometimes referred to
-            as a type code, that identifies the generic SQL type &lt;code&gt;NCLOB&lt;/code&gt;.</summary>
+            as a type code, that identifies the generic SQL type <c>NCLOB</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -923,7 +923,7 @@
       <Docs>
         <summary>The constant in the Java programming language
             that identifies the generic SQL value
-            &lt;code&gt;NULL&lt;/code&gt;.</summary>
+            <c>NULL</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -962,7 +962,7 @@
       <Docs>
         <summary>The constant in the Java programming language, sometimes referred
             to as a type code, that identifies the generic SQL type
-            &lt;code&gt;NUMERIC&lt;/code&gt;.</summary>
+            <c>NUMERIC</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -1000,7 +1000,7 @@
       <MemberValue>-9</MemberValue>
       <Docs>
         <summary>The constant in the Java programming language, sometimes referred to
-            as a type code, that identifies the generic SQL type &lt;code&gt;NVARCHAR&lt;/code&gt;.</summary>
+            as a type code, that identifies the generic SQL type <c>NVARCHAR</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -1039,7 +1039,7 @@
         <summary>The constant in the Java programming language that indicates
             that the SQL type is database-specific and
             gets mapped to a Java object that can be accessed via
-            the methods &lt;code&gt;getObject&lt;/code&gt; and &lt;code&gt;setObject&lt;/code&gt;.</summary>
+            the methods <c>getObject</c> and <c>setObject</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -1078,7 +1078,7 @@
       <Docs>
         <summary>The constant in the Java programming language, sometimes referred
             to as a type code, that identifies the generic SQL type
-            &lt;code&gt;REAL&lt;/code&gt;.</summary>
+            <c>REAL</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -1117,7 +1117,7 @@
       <Docs>
         <summary>The constant in the Java programming language, sometimes referred to
             as a type code, that identifies the generic SQL type
-            &lt;code&gt;REF&lt;/code&gt;.</summary>
+            <c>REF</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -1155,7 +1155,7 @@
       <MemberValue>-8</MemberValue>
       <Docs>
         <summary>The constant in the Java programming language, sometimes referred to
-            as a type code, that identifies the generic SQL type &lt;code&gt;ROWID&lt;/code&gt;</summary>
+            as a type code, that identifies the generic SQL type <c>ROWID</c></summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -1193,7 +1193,7 @@
       <Docs>
         <summary>The constant in the Java programming language, sometimes referred
             to as a type code, that identifies the generic SQL type
-            &lt;code&gt;SMALLINT&lt;/code&gt;.</summary>
+            <c>SMALLINT</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -1231,7 +1231,7 @@
       <MemberValue>2009</MemberValue>
       <Docs>
         <summary>The constant in the Java programming language, sometimes referred to
-            as a type code, that identifies the generic SQL type &lt;code&gt;XML&lt;/code&gt;.</summary>
+            as a type code, that identifies the generic SQL type <c>XML</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -1269,7 +1269,7 @@
       <Docs>
         <summary>The constant in the Java programming language, sometimes referred to
             as a type code, that identifies the generic SQL type
-            &lt;code&gt;STRUCT&lt;/code&gt;.</summary>
+            <c>STRUCT</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -1370,7 +1370,7 @@
       <Docs>
         <summary>The constant in the Java programming language, sometimes referred
             to as a type code, that identifies the generic SQL type
-            &lt;code&gt;TIME&lt;/code&gt;.</summary>
+            <c>TIME</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -1409,7 +1409,7 @@
       <Docs>
         <summary>The constant in the Java programming language, sometimes referred
             to as a type code, that identifies the generic SQL type
-            &lt;code&gt;TIMESTAMP&lt;/code&gt;.</summary>
+            <c>TIMESTAMP</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -1448,7 +1448,7 @@
       <Docs>
         <summary>The constant in the Java programming language, sometimes referred
             to as a type code, that identifies the generic SQL type
-            &lt;code&gt;TINYINT&lt;/code&gt;.</summary>
+            <c>TINYINT</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -1487,7 +1487,7 @@
       <Docs>
         <summary>The constant in the Java programming language, sometimes referred
             to as a type code, that identifies the generic SQL type
-            &lt;code&gt;VARBINARY&lt;/code&gt;.</summary>
+            <c>VARBINARY</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -1526,7 +1526,7 @@
       <Docs>
         <summary>The constant in the Java programming language, sometimes referred
             to as a type code, that identifies the generic SQL type
-            &lt;code&gt;VARCHAR&lt;/code&gt;.</summary>
+            <c>VARCHAR</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.Text/Bidi.xml b/docs/Mono.Android/en/Java.Text/Bidi.xml
index 278beed530..a51155ebf8 100644
--- a/docs/Mono.Android/en/Java.Text/Bidi.xml
+++ b/docs/Mono.Android/en/Java.Text/Bidi.xml
@@ -517,7 +517,7 @@
         <Parameter Name="run" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="run">the index of the run, between 0 and &lt;code&gt;getRunCount()&lt;/code&gt;</param>
+        <param name="run">the index of the run, between 0 and <c>getRunCount()</c></param>
         <summary>Return the level of the nth logical run in this line.</summary>
         <returns>the level of the run</returns>
         <remarks>
@@ -558,7 +558,7 @@
         <Parameter Name="run" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="run">the index of the run, between 0 and &lt;code&gt;getRunCount()&lt;/code&gt;</param>
+        <param name="run">the index of the run, between 0 and <c>getRunCount()</c></param>
         <summary>Return the index of the character past the end of the nth logical run in this line, as
             an offset from the start of the line.</summary>
         <returns>limit the limit of the run</returns>
@@ -600,7 +600,7 @@
         <Parameter Name="run" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="run">the index of the run, between 0 and &lt;code&gt;getRunCount()&lt;/code&gt;</param>
+        <param name="run">the index of the run, between 0 and <c>getRunCount()</c></param>
         <summary>Return the index of the character at the start of the nth logical run in this line, as
             an offset from the start of the line.</summary>
         <returns>the start of the run</returns>
diff --git a/docs/Mono.Android/en/Java.Text/BreakIterator.xml b/docs/Mono.Android/en/Java.Text/BreakIterator.xml
index 3698d082d1..c8108d662d 100644
--- a/docs/Mono.Android/en/Java.Text/BreakIterator.xml
+++ b/docs/Mono.Android/en/Java.Text/BreakIterator.xml
@@ -31,7 +31,7 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>The &lt;code&gt;BreakIterator&lt;/code&gt; class implements methods for finding
+    <summary>The <c>BreakIterator</c> class implements methods for finding
             the location of boundaries in text.</summary>
     <remarks>
       <para>
@@ -124,7 +124,7 @@
         <ReturnType>Java.Text.BreakIterator</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Returns a new &lt;code&gt;BreakIterator&lt;/code&gt; instance
+        <summary>Returns a new <c>BreakIterator</c> instance
             for "BreakIterator.</summary>
         <value>A break iterator for character breaks</value>
         <remarks>
@@ -324,7 +324,7 @@
         <param name="offset">the character offset to begin scanning.</param>
         <summary>Returns the first boundary following the specified character offset.</summary>
         <returns>The first boundary after the specified offset or
-            &lt;code&gt;BreakIterator.DONE&lt;/code&gt; if the last text boundary is passed in
+            <c>BreakIterator.DONE</c> if the last text boundary is passed in
             as the offset.</returns>
         <remarks>
           <para>
@@ -365,10 +365,10 @@
       <Parameters />
       <Docs>
         <summary>Returns an array of all locales for which the
-            &lt;code&gt;get*Instance&lt;/code&gt; methods of this class can return
+            <c>get*Instance</c> methods of this class can return
             localized instances.</summary>
         <returns>An array of locales for which localized
-                    &lt;code&gt;BreakIterator&lt;/code&gt; instances are available.</returns>
+                    <c>BreakIterator</c> instances are available.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -408,7 +408,7 @@
       </Parameters>
       <Docs>
         <param name="locale">the desired locale</param>
-        <summary>Returns a new &lt;code&gt;BreakIterator&lt;/code&gt; instance
+        <summary>Returns a new <c>BreakIterator</c> instance
             for "BreakIterator.</summary>
         <returns>A break iterator for character breaks</returns>
         <remarks>
@@ -450,7 +450,7 @@
       </Parameters>
       <Docs>
         <param name="locale">the desired locale</param>
-        <summary>Returns a new &lt;code&gt;BreakIterator&lt;/code&gt; instance
+        <summary>Returns a new <c>BreakIterator</c> instance
             for "BreakIterator.</summary>
         <returns>A break iterator for line breaks</returns>
         <remarks>
@@ -494,7 +494,7 @@
       </Parameters>
       <Docs>
         <param name="locale">the desired locale</param>
-        <summary>Returns a new &lt;code&gt;BreakIterator&lt;/code&gt; instance
+        <summary>Returns a new <c>BreakIterator</c> instance
             for "BreakIterator.</summary>
         <returns>A break iterator for sentence breaks</returns>
         <remarks>
@@ -538,7 +538,7 @@
       </Parameters>
       <Docs>
         <param name="locale">the desired locale</param>
-        <summary>Returns a new &lt;code&gt;BreakIterator&lt;/code&gt; instance
+        <summary>Returns a new <c>BreakIterator</c> instance
             for "BreakIterator.</summary>
         <returns>A break iterator for word breaks</returns>
         <remarks>
@@ -583,8 +583,9 @@
       <Docs>
         <param name="offset">the character offset to check.</param>
         <summary>Returns true if the specified character offset is a text boundary.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if "offset" is a boundary position,
-            &lt;code&gt;false&lt;/code&gt; otherwise.</returns>
+        <returns>
+          <c>true</c> if "offset" is a boundary position,
+            <c>false</c> otherwise.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -692,7 +693,7 @@
         <ReturnType>Java.Text.BreakIterator</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Returns a new &lt;code&gt;BreakIterator&lt;/code&gt; instance
+        <summary>Returns a new <c>BreakIterator</c> instance
             for "BreakIterator.</summary>
         <value>A break iterator for line breaks</value>
         <remarks>
@@ -733,7 +734,7 @@
       <Docs>
         <summary>Returns the boundary following the current boundary.</summary>
         <returns>The character index of the next text boundary or
-            &lt;code&gt;BreakIterator.DONE&lt;/code&gt; if the current boundary is the last text
+            <c>BreakIterator.DONE</c> if the current boundary is the last text
             boundary.
             Equivalent to next(1).</returns>
         <remarks>
@@ -779,7 +780,7 @@
             and positive values move to later boundaries.</param>
         <summary>Returns the nth boundary from the current boundary.</summary>
         <returns>The character index of the nth boundary from the current position
-            or &lt;code&gt;BreakIterator.DONE&lt;/code&gt; if either first or last text boundary
+            or <c>BreakIterator.DONE</c> if either first or last text boundary
             has been reached.</returns>
         <remarks>
           <para>
@@ -822,7 +823,7 @@
         <param name="offset">the character offset to begin scanning.</param>
         <summary>Returns the last boundary preceding the specified character offset.</summary>
         <returns>The last boundary before the specified offset or
-            &lt;code&gt;BreakIterator.DONE&lt;/code&gt; if the first text boundary is passed in
+            <c>BreakIterator.DONE</c> if the first text boundary is passed in
             as the offset.</returns>
         <remarks>
           <para>
@@ -864,7 +865,7 @@
       <Docs>
         <summary>Returns the boundary preceding the current boundary.</summary>
         <returns>The character index of the previous text boundary or
-            &lt;code&gt;BreakIterator.DONE&lt;/code&gt; if the current boundary is the first text
+            <c>BreakIterator.DONE</c> if the current boundary is the first text
             boundary.</returns>
         <remarks>
           <para>
@@ -901,7 +902,7 @@
         <ReturnType>Java.Text.BreakIterator</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Returns a new &lt;code&gt;BreakIterator&lt;/code&gt; instance
+        <summary>Returns a new <c>BreakIterator</c> instance
             for "BreakIterator.</summary>
         <value>A break iterator for sentence breaks</value>
         <remarks>
@@ -1074,7 +1075,7 @@
         <ReturnType>Java.Text.BreakIterator</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Returns a new &lt;code&gt;BreakIterator&lt;/code&gt; instance
+        <summary>Returns a new <c>BreakIterator</c> instance
             for "BreakIterator.</summary>
         <value>A break iterator for word breaks</value>
         <remarks>
diff --git a/docs/Mono.Android/en/Java.Text/ChoiceFormat.xml b/docs/Mono.Android/en/Java.Text/ChoiceFormat.xml
index 2f73d84f2e..c1d5115ac9 100644
--- a/docs/Mono.Android/en/Java.Text/ChoiceFormat.xml
+++ b/docs/Mono.Android/en/Java.Text/ChoiceFormat.xml
@@ -18,7 +18,7 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>A &lt;code&gt;ChoiceFormat&lt;/code&gt; allows you to attach a format to a range of numbers.</summary>
+    <summary>A <c>ChoiceFormat</c> allows you to attach a format to a range of numbers.</summary>
     <remarks>
       <para>
         <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.Text/CollationElementIterator.xml b/docs/Mono.Android/en/Java.Text/CollationElementIterator.xml
index 356880d6c4..193e67923d 100644
--- a/docs/Mono.Android/en/Java.Text/CollationElementIterator.xml
+++ b/docs/Mono.Android/en/Java.Text/CollationElementIterator.xml
@@ -18,7 +18,7 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>The &lt;code&gt;CollationElementIterator&lt;/code&gt; class is used as an iterator
+    <summary>The <c>CollationElementIterator</c> class is used as an iterator
             to walk through each character of an international string.</summary>
     <remarks>
       <para>
diff --git a/docs/Mono.Android/en/Java.Text/CollationKey.xml b/docs/Mono.Android/en/Java.Text/CollationKey.xml
index 8b52526ed2..3f6bbf902c 100644
--- a/docs/Mono.Android/en/Java.Text/CollationKey.xml
+++ b/docs/Mono.Android/en/Java.Text/CollationKey.xml
@@ -31,8 +31,8 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>A &lt;code&gt;CollationKey&lt;/code&gt; represents a &lt;code&gt;String&lt;/code&gt; under the
-            rules of a specific &lt;code&gt;Collator&lt;/code&gt; object.</summary>
+    <summary>A <c>CollationKey</c> represents a <c>String</c> under the
+            rules of a specific <c>Collator</c> object.</summary>
     <remarks>
       <para>
         <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.Text/Collator.xml b/docs/Mono.Android/en/Java.Text/Collator.xml
index f7cf756207..554764e81b 100644
--- a/docs/Mono.Android/en/Java.Text/Collator.xml
+++ b/docs/Mono.Android/en/Java.Text/Collator.xml
@@ -34,8 +34,8 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>The &lt;code&gt;Collator&lt;/code&gt; class performs locale-sensitive
-            &lt;code&gt;String&lt;/code&gt; comparison.</summary>
+    <summary>The <c>Collator</c> class performs locale-sensitive
+            <c>String</c> comparison.</summary>
     <remarks>
       <para>
         <format type="text/html">
@@ -468,10 +468,10 @@
       <Parameters />
       <Docs>
         <summary>Returns an array of all locales for which the
-            &lt;code&gt;getInstance&lt;/code&gt; methods of this class can return
+            <c>getInstance</c> methods of this class can return
             localized instances.</summary>
         <returns>An array of locales for which localized
-                    &lt;code&gt;Collator&lt;/code&gt; instances are available.</returns>
+                    <c>Collator</c> instances are available.</returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.Text/DateFormat+Field.xml b/docs/Mono.Android/en/Java.Text/DateFormat+Field.xml
index 5dceabed5d..599675d515 100644
--- a/docs/Mono.Android/en/Java.Text/DateFormat+Field.xml
+++ b/docs/Mono.Android/en/Java.Text/DateFormat+Field.xml
@@ -19,8 +19,9 @@
   </Attributes>
   <Docs>
     <summary>Defines constants that are used as attribute keys in the
-            &lt;code&gt;AttributedCharacterIterator&lt;/code&gt; returned
-            from &lt;code&gt;DateFormat.</summary>
+            <c>AttributedCharacterIterator</c> returned
+            from <c>DateFormat.formatToCharacterIterator</c> and as
+            field identifiers in <c>FieldPosition</c>.</summary>
     <remarks>
       <para>
         <format type="text/html">
@@ -80,13 +81,13 @@
         <Parameter Name="calendarField" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="name">the name of the &lt;code&gt;Field&lt;/code&gt;</param>
-        <param name="calendarField">the &lt;code&gt;Calendar&lt;/code&gt; constant this
-                   &lt;code&gt;Field&lt;/code&gt; corresponds to; any value, even one
-                   outside the range of legal &lt;code&gt;Calendar&lt;/code&gt; values may
-                   be used, but &lt;code&gt;-1&lt;/code&gt; should be used for values
-                   that don't correspond to legal &lt;code&gt;Calendar&lt;/code&gt; values</param>
-        <summary>Creates a &lt;code&gt;Field&lt;/code&gt;.</summary>
+        <param name="name">the name of the <c>Field</c></param>
+        <param name="calendarField">the <c>Calendar</c> constant this
+                   <c>Field</c> corresponds to; any value, even one
+                   outside the range of legal <c>Calendar</c> values may
+                   be used, but <c>-1</c> should be used for values
+                   that don't correspond to legal <c>Calendar</c> values</param>
+        <summary>Creates a <c>Field</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -150,7 +151,7 @@
         <ReturnType>System.Int32</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Returns the &lt;code&gt;Calendar&lt;/code&gt; field associated with this
+        <summary>Returns the <c>Calendar</c> field associated with this
             attribute.</summary>
         <value>Calendar constant for this field</value>
         <remarks>
diff --git a/docs/Mono.Android/en/Java.Text/DateFormat.xml b/docs/Mono.Android/en/Java.Text/DateFormat.xml
index 012a9d0b8f..859f580f6b 100644
--- a/docs/Mono.Android/en/Java.Text/DateFormat.xml
+++ b/docs/Mono.Android/en/Java.Text/DateFormat.xml
@@ -699,10 +699,10 @@
       <Parameters />
       <Docs>
         <summary>Returns an array of all locales for which the
-            &lt;code&gt;get*Instance&lt;/code&gt; methods of this class can return
+            <c>get*Instance</c> methods of this class can return
             localized instances.</summary>
         <returns>An array of locales for which localized
-                    &lt;code&gt;DateFormat&lt;/code&gt; instances are available.</returns>
+                    <c>DateFormat</c> instances are available.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1528,9 +1528,9 @@
         <Parameter Name="source" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="source">A &lt;code&gt;String&lt;/code&gt; whose beginning should be parsed.</param>
+        <param name="source">A <c>String</c> whose beginning should be parsed.</param>
         <summary>Parses text from the beginning of the given string to produce a date.</summary>
-        <returns>A &lt;code&gt;Date&lt;/code&gt; parsed from the string.</returns>
+        <returns>A <c>Date</c> parsed from the string.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1617,11 +1617,11 @@
         <Parameter Name="pos" Type="Java.Text.ParsePosition" />
       </Parameters>
       <Docs>
-        <param name="source">A &lt;code&gt;String&lt;/code&gt;, part of which should be parsed.</param>
-        <param name="pos">A &lt;code&gt;ParsePosition&lt;/code&gt; object with index and error
+        <param name="source">A <c>String</c>, part of which should be parsed.</param>
+        <param name="pos">A <c>ParsePosition</c> object with index and error
                        index information as described above.</param>
-        <summary>Parses text from a string to produce a &lt;code&gt;Date&lt;/code&gt;.</summary>
-        <returns>A &lt;code&gt;Date&lt;/code&gt; parsed from the string. In case of
+        <summary>Parses text from a string to produce a <c>Date</c>.</summary>
+        <returns>A <c>Date</c> parsed from the string. In case of
                     error, returns null.</returns>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.Text/DateFormatSymbols.xml b/docs/Mono.Android/en/Java.Text/DateFormatSymbols.xml
index 7f16b2a164..48980a48ce 100644
--- a/docs/Mono.Android/en/Java.Text/DateFormatSymbols.xml
+++ b/docs/Mono.Android/en/Java.Text/DateFormatSymbols.xml
@@ -34,7 +34,8 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>&lt;code&gt;DateFormatSymbols&lt;/code&gt; is a public class for encapsulating
+    <summary>
+      <c>DateFormatSymbols</c> is a public class for encapsulating
             localizable date-time formatting data, such as the names of the
             months, the names of the days of the week, and the time zone data.</summary>
     <remarks>
@@ -246,10 +247,10 @@
       <Parameters />
       <Docs>
         <summary>Returns an array of all locales for which the
-            &lt;code&gt;getInstance&lt;/code&gt; methods of this class can return
+            <c>getInstance</c> methods of this class can return
             localized instances.</summary>
         <returns>An array of locales for which localized
-                    &lt;code&gt;DateFormatSymbols&lt;/code&gt; instances are available.</returns>
+                    <c>DateFormatSymbols</c> instances are available.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -327,9 +328,9 @@
       </Parameters>
       <Docs>
         <param name="locale">the given locale.</param>
-        <summary>Gets the &lt;code&gt;DateFormatSymbols&lt;/code&gt; instance for the specified
+        <summary>Gets the <c>DateFormatSymbols</c> instance for the specified
             locale.</summary>
-        <returns>a &lt;code&gt;DateFormatSymbols&lt;/code&gt; instance.</returns>
+        <returns>a <c>DateFormatSymbols</c> instance.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -444,8 +445,8 @@
       <Parameters />
       <Docs>
         <summary>Gets short weekday strings.</summary>
-        <returns>the short weekday strings. Use &lt;code&gt;Calendar.SUNDAY&lt;/code&gt;,
-            &lt;code&gt;Calendar.MONDAY&lt;/code&gt;, etc. to index the result array.</returns>
+        <returns>the short weekday strings. Use <c>Calendar.SUNDAY</c>,
+            <c>Calendar.MONDAY</c>, etc. to index the result array.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -483,8 +484,8 @@
       <Parameters />
       <Docs>
         <summary>Gets weekday strings.</summary>
-        <returns>the weekday strings. Use &lt;code&gt;Calendar.SUNDAY&lt;/code&gt;,
-            &lt;code&gt;Calendar.MONDAY&lt;/code&gt;, etc. to index the result array.</returns>
+        <returns>the weekday strings. Use <c>Calendar.SUNDAY</c>,
+            <c>Calendar.MONDAY</c>, etc. to index the result array.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -558,9 +559,9 @@
         <ReturnType>Java.Text.DateFormatSymbols</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Gets the &lt;code&gt;DateFormatSymbols&lt;/code&gt; instance for the default
+        <summary>Gets the <c>DateFormatSymbols</c> instance for the default
             locale.</summary>
-        <value>a &lt;code&gt;DateFormatSymbols&lt;/code&gt; instance.</value>
+        <value>a <c>DateFormatSymbols</c> instance.</value>
         <remarks>
           <para>
             <format type="text/html">
@@ -856,8 +857,8 @@
       </Parameters>
       <Docs>
         <param name="newShortWeekdays">the new short weekday strings. The array should
-            be indexed by &lt;code&gt;Calendar.SUNDAY&lt;/code&gt;,
-            &lt;code&gt;Calendar.MONDAY&lt;/code&gt;, etc.</param>
+            be indexed by <c>Calendar.SUNDAY</c>,
+            <c>Calendar.MONDAY</c>, etc.</param>
         <summary>Sets short weekday strings.</summary>
         <remarks>
           <para>
@@ -898,8 +899,8 @@
       </Parameters>
       <Docs>
         <param name="newWeekdays">the new weekday strings. The array should
-            be indexed by &lt;code&gt;Calendar.SUNDAY&lt;/code&gt;,
-            &lt;code&gt;Calendar.MONDAY&lt;/code&gt;, etc.</param>
+            be indexed by <c>Calendar.SUNDAY</c>,
+            <c>Calendar.MONDAY</c>, etc.</param>
         <summary>Sets weekday strings.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.Text/DecimalFormat.xml b/docs/Mono.Android/en/Java.Text/DecimalFormat.xml
index 838c7af56b..1e0dc32daa 100644
--- a/docs/Mono.Android/en/Java.Text/DecimalFormat.xml
+++ b/docs/Mono.Android/en/Java.Text/DecimalFormat.xml
@@ -18,8 +18,9 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>&lt;code&gt;DecimalFormat&lt;/code&gt; is a concrete subclass of
-            &lt;code&gt;NumberFormat&lt;/code&gt; that formats decimal numbers.</summary>
+    <summary>
+      <c>DecimalFormat</c> is a concrete subclass of
+            <c>NumberFormat</c> that formats decimal numbers.</summary>
     <remarks>
       <para>
         <format type="text/html">
@@ -387,13 +388,13 @@
       </Parameters>
       <Docs>
         <param name="number">the number to format</param>
-        <param name="toAppendTo">the &lt;code&gt;StringBuffer&lt;/code&gt; to which the formatted
+        <param name="toAppendTo">the <c>StringBuffer</c> to which the formatted
                               text is to be appended</param>
         <param name="pos">On input: an alignment field, if desired.
                               On output: the offsets of the alignment field.</param>
         <summary>Formats a number and appends the resulting text to the given string
             buffer.</summary>
-        <returns>the value passed in as &lt;code&gt;toAppendTo&lt;/code&gt;</returns>
+        <returns>the value passed in as <c>toAppendTo</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -755,10 +756,10 @@
       </Parameters>
       <Docs>
         <param name="text">the string to be parsed</param>
-        <param name="pos">A &lt;code&gt;ParsePosition&lt;/code&gt; object with index and error
+        <param name="pos">A <c>ParsePosition</c> object with index and error
                         index information as described above.</param>
-        <summary>Parses text from a string to produce a &lt;code&gt;Number&lt;/code&gt;.</summary>
-        <returns>the parsed value, or &lt;code&gt;null&lt;/code&gt; if the parse fails</returns>
+        <summary>Parses text from a string to produce a <c>Number</c>.</summary>
+        <returns>the parsed value, or <c>null</c> if the parse fails</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -802,8 +803,8 @@
           <c>true</c> if the parse method returns BigDecimal;
                             <c>false</c> otherwise</param>
         <summary>Returns whether the <c>#parse(java.lang.String, java.text.ParsePosition)</c>
-            method returns &lt;code&gt;BigDecimal&lt;/code&gt;. -or- Sets whether the <c>#parse(java.lang.String, java.text.ParsePosition)</c>
-            method returns &lt;code&gt;BigDecimal&lt;/code&gt;.</summary>
+            method returns <c>BigDecimal</c>. -or- Sets whether the <c>#parse(java.lang.String, java.text.ParsePosition)</c>
+            method returns <c>BigDecimal</c>.</summary>
         <value>
           <c>true</c> if the parse method returns BigDecimal;
                     <c>false</c> otherwise</value>
diff --git a/docs/Mono.Android/en/Java.Text/DecimalFormatSymbols.xml b/docs/Mono.Android/en/Java.Text/DecimalFormatSymbols.xml
index e6b86541ad..d687c67f06 100644
--- a/docs/Mono.Android/en/Java.Text/DecimalFormatSymbols.xml
+++ b/docs/Mono.Android/en/Java.Text/DecimalFormatSymbols.xml
@@ -35,7 +35,7 @@
   </Attributes>
   <Docs since="1">
     <summary>This class represents the set of symbols (such as the decimal separator,
-            the grouping separator, and so on) needed by &lt;code&gt;DecimalFormat&lt;/code&gt;
+            the grouping separator, and so on) needed by <c>DecimalFormat</c>
             to format numbers.</summary>
     <remarks>
       <para>
@@ -467,10 +467,10 @@
       <Parameters />
       <Docs>
         <summary>Returns an array of all locales for which the
-            &lt;code&gt;getInstance&lt;/code&gt; methods of this class can return
+            <c>getInstance</c> methods of this class can return
             localized instances.</summary>
         <returns>an array of locales for which localized
-                    &lt;code&gt;DecimalFormatSymbols&lt;/code&gt; instances are available.</returns>
+                    <c>DecimalFormatSymbols</c> instances are available.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -510,9 +510,9 @@
       </Parameters>
       <Docs>
         <param name="locale">the desired locale.</param>
-        <summary>Gets the &lt;code&gt;DecimalFormatSymbols&lt;/code&gt; instance for the specified
+        <summary>Gets the <c>DecimalFormatSymbols</c> instance for the specified
             locale.</summary>
-        <returns>a &lt;code&gt;DecimalFormatSymbols&lt;/code&gt; instance.</returns>
+        <returns>a <c>DecimalFormatSymbols</c> instance.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -647,9 +647,9 @@
         <ReturnType>Java.Text.DecimalFormatSymbols</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Gets the &lt;code&gt;DecimalFormatSymbols&lt;/code&gt; instance for the default
+        <summary>Gets the <c>DecimalFormatSymbols</c> instance for the default
             locale.</summary>
-        <value>a &lt;code&gt;DecimalFormatSymbols&lt;/code&gt; instance.</value>
+        <value>a <c>DecimalFormatSymbols</c> instance.</value>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.Text/FieldPosition.xml b/docs/Mono.Android/en/Java.Text/FieldPosition.xml
index b686ea903e..d79176d0f7 100644
--- a/docs/Mono.Android/en/Java.Text/FieldPosition.xml
+++ b/docs/Mono.Android/en/Java.Text/FieldPosition.xml
@@ -18,7 +18,8 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>&lt;code&gt;FieldPosition&lt;/code&gt; is a simple class used by &lt;code&gt;Format&lt;/code&gt;
+    <summary>
+      <c>FieldPosition</c> is a simple class used by <c>Format</c>
             and its subclasses to identify fields in formatted output.</summary>
     <remarks>
       <para>
diff --git a/docs/Mono.Android/en/Java.Text/MessageFormat+Field.xml b/docs/Mono.Android/en/Java.Text/MessageFormat+Field.xml
index 5d29bcdf9c..5d4a3ed6fc 100644
--- a/docs/Mono.Android/en/Java.Text/MessageFormat+Field.xml
+++ b/docs/Mono.Android/en/Java.Text/MessageFormat+Field.xml
@@ -19,8 +19,8 @@
   </Attributes>
   <Docs>
     <summary>Defines constants that are used as attribute keys in the
-            &lt;code&gt;AttributedCharacterIterator&lt;/code&gt; returned
-            from &lt;code&gt;MessageFormat.</summary>
+            <c>AttributedCharacterIterator</c> returned
+            from <c>MessageFormat.formatToCharacterIterator</c>.</summary>
     <remarks>
       <para>
         <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.Text/MessageFormat.xml b/docs/Mono.Android/en/Java.Text/MessageFormat.xml
index 702fdae7e4..b07e49ad74 100644
--- a/docs/Mono.Android/en/Java.Text/MessageFormat.xml
+++ b/docs/Mono.Android/en/Java.Text/MessageFormat.xml
@@ -18,7 +18,8 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>&lt;code&gt;MessageFormat&lt;/code&gt; provides a means to produce concatenated
+    <summary>
+      <c>MessageFormat</c> provides a means to produce concatenated
             messages in a language-neutral way.</summary>
     <remarks>
       <para>
@@ -264,9 +265,9 @@
         <param name="result">where text is appended.</param>
         <param name="pos">On input: an alignment field, if desired.
                        On output: the offsets of the alignment field.</param>
-        <summary>Formats an array of objects and appends the &lt;code&gt;MessageFormat&lt;/code&gt;'s
+        <summary>Formats an array of objects and appends the <c>MessageFormat</c>'s
             pattern, with format elements replaced by the formatted objects, to the
-            provided &lt;code&gt;StringBuffer&lt;/code&gt;.</summary>
+            provided <c>StringBuffer</c>.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
@@ -314,9 +315,9 @@
         <param name="result">where text is appended.</param>
         <param name="pos">On input: an alignment field, if desired.
                        On output: the offsets of the alignment field.</param>
-        <summary>Formats an array of objects and appends the &lt;code&gt;MessageFormat&lt;/code&gt;'s
+        <summary>Formats an array of objects and appends the <c>MessageFormat</c>'s
             pattern, with format elements replaced by the formatted objects, to the
-            provided &lt;code&gt;StringBuffer&lt;/code&gt;.</summary>
+            provided <c>StringBuffer</c>.</summary>
         <returns>the string buffer passed in as <c>result</c>, with formatted
             text appended</returns>
         <remarks>
@@ -395,7 +396,7 @@
       <Parameters />
       <Docs>
         <summary>Gets the formats used for the values passed into
-            &lt;code&gt;format&lt;/code&gt; methods or returned from &lt;code&gt;parse&lt;/code&gt;
+            <c>format</c> methods or returned from <c>parse</c>
             methods.</summary>
         <returns>the formats used for the arguments within the pattern</returns>
         <remarks>
@@ -516,10 +517,10 @@
         <Parameter Name="source" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="source">A &lt;code&gt;String&lt;/code&gt; whose beginning should be parsed.</param>
+        <param name="source">A <c>String</c> whose beginning should be parsed.</param>
         <summary>Parses text from the beginning of the given string to produce an object
             array.</summary>
-        <returns>An &lt;code&gt;Object&lt;/code&gt; array parsed from the string.</returns>
+        <returns>An <c>Object</c> array parsed from the string.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -604,11 +605,11 @@
         <Parameter Name="pos" Type="Java.Text.ParsePosition" />
       </Parameters>
       <Docs>
-        <param name="source">A &lt;code&gt;String&lt;/code&gt;, part of which should be parsed.</param>
-        <param name="pos">A &lt;code&gt;ParsePosition&lt;/code&gt; object with index and error
+        <param name="source">A <c>String</c>, part of which should be parsed.</param>
+        <param name="pos">A <c>ParsePosition</c> object with index and error
                        index information as described above.</param>
         <summary>Parses text from a string to produce an object array.</summary>
-        <returns>An &lt;code&gt;Object&lt;/code&gt; array parsed from the string. In case of
+        <returns>An <c>Object</c> array parsed from the string. In case of
                     error, returns null.</returns>
         <remarks>
           <para>
@@ -778,7 +779,7 @@
       <Docs>
         <param name="newFormats">the new formats to use</param>
         <summary>Sets the formats to use for the values passed into
-            &lt;code&gt;format&lt;/code&gt; methods or returned from &lt;code&gt;parse&lt;/code&gt;
+            <c>format</c> methods or returned from <c>parse</c>
             methods.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.Text/Normalizer.xml b/docs/Mono.Android/en/Java.Text/Normalizer.xml
index 11f1e1a4d6..5fd82f4441 100644
--- a/docs/Mono.Android/en/Java.Text/Normalizer.xml
+++ b/docs/Mono.Android/en/Java.Text/Normalizer.xml
@@ -18,7 +18,7 @@
     </Attribute>
   </Attributes>
   <Docs since="9">
-    <summary>This class provides the method &lt;code&gt;normalize&lt;/code&gt; which transforms Unicode
+    <summary>This class provides the method <c>normalize</c> which transforms Unicode
             text into an equivalent composed or decomposed form, allowing for easier
             sorting and searching of text.</summary>
     <remarks>
diff --git a/docs/Mono.Android/en/Java.Text/NumberFormat+Field.xml b/docs/Mono.Android/en/Java.Text/NumberFormat+Field.xml
index 912fe65a25..492f6e45fa 100644
--- a/docs/Mono.Android/en/Java.Text/NumberFormat+Field.xml
+++ b/docs/Mono.Android/en/Java.Text/NumberFormat+Field.xml
@@ -19,8 +19,9 @@
   </Attributes>
   <Docs>
     <summary>Defines constants that are used as attribute keys in the
-            &lt;code&gt;AttributedCharacterIterator&lt;/code&gt; returned
-            from &lt;code&gt;NumberFormat.</summary>
+            <c>AttributedCharacterIterator</c> returned
+            from <c>NumberFormat.formatToCharacterIterator</c> and as
+            field identifiers in <c>FieldPosition</c>.</summary>
     <remarks>
       <para>
         <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.Text/NumberFormat.xml b/docs/Mono.Android/en/Java.Text/NumberFormat.xml
index 504d762f49..75eec472cc 100644
--- a/docs/Mono.Android/en/Java.Text/NumberFormat.xml
+++ b/docs/Mono.Android/en/Java.Text/NumberFormat.xml
@@ -18,7 +18,8 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>&lt;code&gt;NumberFormat&lt;/code&gt; is the abstract base class for all number
+    <summary>
+      <c>NumberFormat</c> is the abstract base class for all number
             formats.</summary>
     <remarks>
       <para>
@@ -119,7 +120,7 @@
         <summary>Gets the currency used by this number format when formatting
             currency values. -or- Sets the currency used by this number format when formatting
             currency values.</summary>
-        <value>the currency used by this number format, or &lt;code&gt;null&lt;/code&gt;</value>
+        <value>the currency used by this number format, or <c>null</c></value>
         <remarks>
           <para>Property getter documentation:</para>
           <para>
@@ -290,13 +291,13 @@
       </Parameters>
       <Docs>
         <param name="number">the number to format</param>
-        <param name="toAppendTo">the &lt;code&gt;StringBuffer&lt;/code&gt; to which the formatted
+        <param name="toAppendTo">the <c>StringBuffer</c> to which the formatted
                               text is to be appended</param>
         <param name="pos">On input: an alignment field, if desired.
                               On output: the offsets of the alignment field.</param>
         <summary>Formats a number and appends the resulting text to the given string
             buffer.</summary>
-        <returns>the value passed in as &lt;code&gt;toAppendTo&lt;/code&gt;</returns>
+        <returns>the value passed in as <c>toAppendTo</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -465,10 +466,10 @@
       <Parameters />
       <Docs>
         <summary>Returns an array of all locales for which the
-            &lt;code&gt;get*Instance&lt;/code&gt; methods of this class can return
+            <c>get*Instance</c> methods of this class can return
             localized instances.</summary>
         <returns>An array of locales for which localized
-                    &lt;code&gt;NumberFormat&lt;/code&gt; instances are available.</returns>
+                    <c>NumberFormat</c> instances are available.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1163,9 +1164,9 @@
         <Parameter Name="source" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="source">A &lt;code&gt;String&lt;/code&gt; whose beginning should be parsed.</param>
+        <param name="source">A <c>String</c> whose beginning should be parsed.</param>
         <summary>Parses text from the beginning of the given string to produce a number.</summary>
-        <returns>A &lt;code&gt;Number&lt;/code&gt; parsed from the string.</returns>
+        <returns>A <c>Number</c> parsed from the string.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1303,11 +1304,11 @@
         <Parameter Name="pos" Type="Java.Text.ParsePosition" />
       </Parameters>
       <Docs>
-        <param name="source">A &lt;code&gt;String&lt;/code&gt;, part of which should be parsed.</param>
-        <param name="pos">A &lt;code&gt;ParsePosition&lt;/code&gt; object with index and error
+        <param name="source">A <c>String</c>, part of which should be parsed.</param>
+        <param name="pos">A <c>ParsePosition</c> object with index and error
                        index information as described above.</param>
-        <summary>Parses text from a string to produce a &lt;code&gt;Number&lt;/code&gt;.</summary>
-        <returns>A &lt;code&gt;Number&lt;/code&gt; parsed from the string. In case of
+        <summary>Parses text from a string to produce a <c>Number</c>.</summary>
+        <returns>A <c>Number</c> parsed from the string. In case of
                     error, returns null.</returns>
         <remarks>
           <para>
@@ -1386,9 +1387,9 @@
         <ReturnType>Java.Math.RoundingMode</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="roundingMode">The &lt;code&gt;RoundingMode&lt;/code&gt; to be used</param>
+        <param name="roundingMode">The <c>RoundingMode</c> to be used</param>
         <summary>Gets the <c>java.math.RoundingMode</c> used in this NumberFormat. -or- Sets the <c>java.math.RoundingMode</c> used in this NumberFormat.</summary>
-        <value>The &lt;code&gt;RoundingMode&lt;/code&gt; used for this NumberFormat.</value>
+        <value>The <c>RoundingMode</c> used for this NumberFormat.</value>
         <remarks>
           <para>Property getter documentation:</para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Text/ParsePosition.xml b/docs/Mono.Android/en/Java.Text/ParsePosition.xml
index ffc70d4930..36c544b646 100644
--- a/docs/Mono.Android/en/Java.Text/ParsePosition.xml
+++ b/docs/Mono.Android/en/Java.Text/ParsePosition.xml
@@ -18,7 +18,8 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>&lt;code&gt;ParsePosition&lt;/code&gt; is a simple class used by &lt;code&gt;Format&lt;/code&gt;
+    <summary>
+      <c>ParsePosition</c> is a simple class used by <c>Format</c>
             and its subclasses to keep track of the current position during parsing.</summary>
     <remarks>
       <para>
diff --git a/docs/Mono.Android/en/Java.Text/RuleBasedCollator.xml b/docs/Mono.Android/en/Java.Text/RuleBasedCollator.xml
index 25e856af3a..2fbf9e3bbc 100644
--- a/docs/Mono.Android/en/Java.Text/RuleBasedCollator.xml
+++ b/docs/Mono.Android/en/Java.Text/RuleBasedCollator.xml
@@ -18,8 +18,8 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>The &lt;code&gt;RuleBasedCollator&lt;/code&gt; class is a concrete subclass of
-            &lt;code&gt;Collator&lt;/code&gt; that provides a simple, data-driven, table
+    <summary>The <c>RuleBasedCollator</c> class is a concrete subclass of
+            <c>Collator</c> that provides a simple, data-driven, table
             collator.</summary>
     <remarks>
       <para>
diff --git a/docs/Mono.Android/en/Java.Text/SimpleDateFormat.xml b/docs/Mono.Android/en/Java.Text/SimpleDateFormat.xml
index 323066d18e..0b3b645217 100644
--- a/docs/Mono.Android/en/Java.Text/SimpleDateFormat.xml
+++ b/docs/Mono.Android/en/Java.Text/SimpleDateFormat.xml
@@ -18,7 +18,8 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>&lt;code&gt;SimpleDateFormat&lt;/code&gt; is a concrete class for formatting and
+    <summary>
+      <c>SimpleDateFormat</c> is a concrete class for formatting and
             parsing dates in a locale-sensitive manner.</summary>
     <remarks>
       <para>
@@ -52,7 +53,7 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <summary>Constructs a &lt;code&gt;SimpleDateFormat&lt;/code&gt; using the default pattern and
+        <summary>Constructs a <c>SimpleDateFormat</c> using the default pattern and
             date format symbols for the default
             <c>java.util.Locale.Category#FORMAT FORMAT</c> locale.</summary>
         <remarks>
@@ -91,7 +92,7 @@
       </Parameters>
       <Docs>
         <param name="pattern">the pattern describing the date and time format</param>
-        <summary>Constructs a &lt;code&gt;SimpleDateFormat&lt;/code&gt; using the given pattern and
+        <summary>Constructs a <c>SimpleDateFormat</c> using the given pattern and
             the default date format symbols for the default
             <c>java.util.Locale.Category#FORMAT FORMAT</c> locale.</summary>
         <remarks>
@@ -159,7 +160,7 @@
       <Docs>
         <param name="pattern">the pattern describing the date and time format</param>
         <param name="formatSymbols">the date format symbols to be used for formatting</param>
-        <summary>Constructs a &lt;code&gt;SimpleDateFormat&lt;/code&gt; using the given pattern and
+        <summary>Constructs a <c>SimpleDateFormat</c> using the given pattern and
             date format symbols.</summary>
         <remarks>
           <para>
@@ -202,7 +203,7 @@
       <Docs>
         <param name="pattern">the pattern describing the date and time format</param>
         <param name="locale">the locale whose date format symbols should be used</param>
-        <summary>Constructs a &lt;code&gt;SimpleDateFormat&lt;/code&gt; using the given pattern and
+        <summary>Constructs a <c>SimpleDateFormat</c> using the given pattern and
             the default date format symbols for the given locale.</summary>
         <remarks>
           <para>
@@ -384,8 +385,8 @@
         <param name="toAppendTo">where the new date-time text is to be appended.</param>
         <param name="pos">the formatting position. On input: an alignment field,
             if desired. On output: the offsets of the alignment field.</param>
-        <summary>Formats the given &lt;code&gt;Date&lt;/code&gt; into a date/time string and appends
-            the result to the given &lt;code&gt;StringBuffer&lt;/code&gt;.</summary>
+        <summary>Formats the given <c>Date</c> into a date/time string and appends
+            the result to the given <c>StringBuffer</c>.</summary>
         <returns>the formatted date-time string.</returns>
         <remarks>
           <para>
@@ -499,11 +500,11 @@
         <Parameter Name="pos" Type="Java.Text.ParsePosition" />
       </Parameters>
       <Docs>
-        <param name="text">A &lt;code&gt;String&lt;/code&gt;, part of which should be parsed.</param>
-        <param name="pos">A &lt;code&gt;ParsePosition&lt;/code&gt; object with index and error
+        <param name="text">A <c>String</c>, part of which should be parsed.</param>
+        <param name="pos">A <c>ParsePosition</c> object with index and error
                          index information as described above.</param>
-        <summary>Parses text from a string to produce a &lt;code&gt;Date&lt;/code&gt;.</summary>
-        <returns>A &lt;code&gt;Date&lt;/code&gt; parsed from the string. In case of
+        <summary>Parses text from a string to produce a <c>Date</c>.</summary>
+        <returns>A <c>Date</c> parsed from the string. In case of
                     error, returns null.</returns>
         <remarks>
           <para>
@@ -546,7 +547,7 @@
       </Parameters>
       <Docs>
         <param name="startDate">During parsing, two digit years will be placed in the range
-            &lt;code&gt;startDate&lt;/code&gt; to &lt;code&gt;startDate + 100 years&lt;/code&gt;.</param>
+            <c>startDate</c> to <c>startDate + 100 years</c>.</param>
         <summary>Sets the 100-year period 2-digit years will be interpreted as being in
             to begin on the date the user specifies.</summary>
         <remarks>
diff --git a/docs/Mono.Android/en/Java.Text/StringCharacterIterator.xml b/docs/Mono.Android/en/Java.Text/StringCharacterIterator.xml
index 7d522040fd..0d4ef4222e 100644
--- a/docs/Mono.Android/en/Java.Text/StringCharacterIterator.xml
+++ b/docs/Mono.Android/en/Java.Text/StringCharacterIterator.xml
@@ -34,8 +34,9 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>&lt;code&gt;StringCharacterIterator&lt;/code&gt; implements the
-            &lt;code&gt;CharacterIterator&lt;/code&gt; protocol for a &lt;code&gt;String&lt;/code&gt;.</summary>
+    <summary>
+      <c>StringCharacterIterator</c> implements the
+            <c>CharacterIterator</c> protocol for a <c>String</c>.</summary>
     <remarks>
       <para>
         <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.Text/_Format+Field.xml b/docs/Mono.Android/en/Java.Text/_Format+Field.xml
index 37e3d8374e..4388ed7d01 100644
--- a/docs/Mono.Android/en/Java.Text/_Format+Field.xml
+++ b/docs/Mono.Android/en/Java.Text/_Format+Field.xml
@@ -19,8 +19,9 @@
   </Attributes>
   <Docs>
     <summary>Defines constants that are used as attribute keys in the
-            &lt;code&gt;AttributedCharacterIterator&lt;/code&gt; returned
-            from &lt;code&gt;Format.</summary>
+            <c>AttributedCharacterIterator</c> returned
+            from <c>Format.formatToCharacterIterator</c> and as
+            field identifiers in <c>FieldPosition</c>.</summary>
     <remarks>
       <para>
         <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.Text/_Format.xml b/docs/Mono.Android/en/Java.Text/_Format.xml
index 892370db43..6b2ae54719 100644
--- a/docs/Mono.Android/en/Java.Text/_Format.xml
+++ b/docs/Mono.Android/en/Java.Text/_Format.xml
@@ -34,7 +34,8 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>&lt;code&gt;Format&lt;/code&gt; is an abstract base class for formatting locale-sensitive
+    <summary>
+      <c>Format</c> is an abstract base class for formatting locale-sensitive
             information such as dates, messages, and numbers.</summary>
     <remarks>
       <para>
@@ -216,11 +217,11 @@
       <Docs>
         <param name="obj">The object to format</param>
         <param name="toAppendTo">where the text is to be appended</param>
-        <param name="pos">A &lt;code&gt;FieldPosition&lt;/code&gt; identifying a field
+        <param name="pos">A <c>FieldPosition</c> identifying a field
                           in the formatted text</param>
         <summary>Formats an object and appends the resulting text to a given string
             buffer.</summary>
-        <returns>the string buffer passed in as &lt;code&gt;toAppendTo&lt;/code&gt;,
+        <returns>the string buffer passed in as <c>toAppendTo</c>,
                           with formatted text appended</returns>
         <remarks>
           <para>
@@ -263,7 +264,7 @@
       </Parameters>
       <Docs>
         <param name="obj">The object to format</param>
-        <summary>Formats an Object producing an &lt;code&gt;AttributedCharacterIterator&lt;/code&gt;.</summary>
+        <summary>Formats an Object producing an <c>AttributedCharacterIterator</c>.</summary>
         <returns>AttributedCharacterIterator describing the formatted value.</returns>
         <remarks>
           <para>
@@ -339,9 +340,9 @@
         <Parameter Name="source" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="source">A &lt;code&gt;String&lt;/code&gt; whose beginning should be parsed.</param>
+        <param name="source">A <c>String</c> whose beginning should be parsed.</param>
         <summary>Parses text from the beginning of the given string to produce an object.</summary>
-        <returns>An &lt;code&gt;Object&lt;/code&gt; parsed from the string.</returns>
+        <returns>An <c>Object</c> parsed from the string.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -383,11 +384,11 @@
         <Parameter Name="pos" Type="Java.Text.ParsePosition" />
       </Parameters>
       <Docs>
-        <param name="source">A &lt;code&gt;String&lt;/code&gt;, part of which should be parsed.</param>
-        <param name="pos">A &lt;code&gt;ParsePosition&lt;/code&gt; object with index and error
+        <param name="source">A <c>String</c>, part of which should be parsed.</param>
+        <param name="pos">A <c>ParsePosition</c> object with index and error
                        index information as described above.</param>
         <summary>Parses text from a string to produce an object.</summary>
-        <returns>An &lt;code&gt;Object&lt;/code&gt; parsed from the string. In case of
+        <returns>An <c>Object</c> parsed from the string. In case of
                     error, returns null.</returns>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Jar/JarEntry.xml b/docs/Mono.Android/en/Java.Util.Jar/JarEntry.xml
index 9e3a8532f1..88205a4f27 100644
--- a/docs/Mono.Android/en/Java.Util.Jar/JarEntry.xml
+++ b/docs/Mono.Android/en/Java.Util.Jar/JarEntry.xml
@@ -54,9 +54,9 @@
         <Parameter Name="je" Type="Java.Util.Jar.JarEntry" />
       </Parameters>
       <Docs>
-        <param name="je">the &lt;code&gt;JarEntry&lt;/code&gt; to copy</param>
-        <summary>Creates a new &lt;code&gt;JarEntry&lt;/code&gt; with fields taken from the
-            specified &lt;code&gt;JarEntry&lt;/code&gt; object.</summary>
+        <param name="je">the <c>JarEntry</c> to copy</param>
+        <summary>Creates a new <c>JarEntry</c> with fields taken from the
+            specified <c>JarEntry</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -92,10 +92,10 @@
         <Parameter Name="ze" Type="Java.Util.Zip.ZipEntry" />
       </Parameters>
       <Docs>
-        <param name="ze">the &lt;code&gt;ZipEntry&lt;/code&gt; object to create the
-                      &lt;code&gt;JarEntry&lt;/code&gt; from</param>
-        <summary>Creates a new &lt;code&gt;JarEntry&lt;/code&gt; with fields taken from the
-            specified &lt;code&gt;ZipEntry&lt;/code&gt; object.</summary>
+        <param name="ze">the <c>ZipEntry</c> object to create the
+                      <c>JarEntry</c> from</param>
+        <summary>Creates a new <c>JarEntry</c> with fields taken from the
+            specified <c>ZipEntry</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -132,7 +132,7 @@
       </Parameters>
       <Docs>
         <param name="name">the JAR file entry name</param>
-        <summary>Creates a new &lt;code&gt;JarEntry&lt;/code&gt; for the specified JAR file
+        <summary>Creates a new <c>JarEntry</c> for the specified JAR file
             entry name.</summary>
         <remarks>
           <para>
@@ -192,10 +192,10 @@
         <ReturnType>Java.Util.Jar.Attributes</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Returns the &lt;code&gt;Manifest&lt;/code&gt; &lt;code&gt;Attributes&lt;/code&gt; for this
-            entry, or &lt;code&gt;null&lt;/code&gt; if none.</summary>
-        <value>the &lt;code&gt;Manifest&lt;/code&gt; &lt;code&gt;Attributes&lt;/code&gt; for this
-            entry, or &lt;code&gt;null&lt;/code&gt; if none</value>
+        <summary>Returns the <c>Manifest</c><c>Attributes</c> for this
+            entry, or <c>null</c> if none.</summary>
+        <value>the <c>Manifest</c><c>Attributes</c> for this
+            entry, or <c>null</c> if none</value>
         <remarks>
           <para>
             <format type="text/html">
@@ -959,10 +959,10 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Returns the &lt;code&gt;Certificate&lt;/code&gt; objects for this entry, or
-            &lt;code&gt;null&lt;/code&gt; if none.</summary>
-        <returns>the &lt;code&gt;Certificate&lt;/code&gt; objects for this entry, or
-            &lt;code&gt;null&lt;/code&gt; if none.</returns>
+        <summary>Returns the <c>Certificate</c> objects for this entry, or
+            <c>null</c> if none.</summary>
+        <returns>the <c>Certificate</c> objects for this entry, or
+            <c>null</c> if none.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1000,10 +1000,10 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Returns the &lt;code&gt;CodeSigner&lt;/code&gt; objects for this entry, or
-            &lt;code&gt;null&lt;/code&gt; if none.</summary>
-        <returns>the &lt;code&gt;CodeSigner&lt;/code&gt; objects for this entry, or
-            &lt;code&gt;null&lt;/code&gt; if none.</returns>
+        <summary>Returns the <c>CodeSigner</c> objects for this entry, or
+            <c>null</c> if none.</summary>
+        <returns>the <c>CodeSigner</c> objects for this entry, or
+            <c>null</c> if none.</returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.Util.Jar/JarFile.xml b/docs/Mono.Android/en/Java.Util.Jar/JarFile.xml
index c4d8aa41e6..447beb6873 100644
--- a/docs/Mono.Android/en/Java.Util.Jar/JarFile.xml
+++ b/docs/Mono.Android/en/Java.Util.Jar/JarFile.xml
@@ -18,8 +18,8 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>The &lt;code&gt;JarFile&lt;/code&gt; class is used to read the contents of a jar file
-            from any file that can be opened with &lt;code&gt;java.</summary>
+    <summary>The <c>JarFile</c> class is used to read the contents of a jar file
+            from any file that can be opened with <c>java.io.RandomAccessFile</c>.</summary>
     <remarks>
       <para>
         <format type="text/html">
@@ -56,8 +56,8 @@
       </Parameters>
       <Docs>
         <param name="file">the jar file to be opened for reading</param>
-        <summary>Creates a new &lt;code&gt;JarFile&lt;/code&gt; to read from the specified
-            &lt;code&gt;File&lt;/code&gt; object.</summary>
+        <summary>Creates a new <c>JarFile</c> to read from the specified
+            <c>File</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -96,8 +96,8 @@
       </Parameters>
       <Docs>
         <param name="name">the name of the jar file to be opened for reading</param>
-        <summary>Creates a new &lt;code&gt;JarFile&lt;/code&gt; to read from the specified
-            file &lt;code&gt;name&lt;/code&gt;.</summary>
+        <summary>Creates a new <c>JarFile</c> to read from the specified
+            file <c>name</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -139,8 +139,8 @@
         <param name="file">the jar file to be opened for reading</param>
         <param name="verify">whether or not to verify the jar file if
             it is signed.</param>
-        <summary>Creates a new &lt;code&gt;JarFile&lt;/code&gt; to read from the specified
-            &lt;code&gt;File&lt;/code&gt; object.</summary>
+        <summary>Creates a new <c>JarFile</c> to read from the specified
+            <c>File</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -205,8 +205,8 @@
         <param name="name">the name of the jar file to be opened for reading</param>
         <param name="verify">whether or not to verify the jar file if
             it is signed.</param>
-        <summary>Creates a new &lt;code&gt;JarFile&lt;/code&gt; to read from the specified
-            file &lt;code&gt;name&lt;/code&gt;.</summary>
+        <summary>Creates a new <c>JarFile</c> to read from the specified
+            file <c>name</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -250,8 +250,8 @@
         <param name="verify">whether or not to verify the jar file if
             it is signed.</param>
         <param name="mode">the mode in which the file is to be opened</param>
-        <summary>Creates a new &lt;code&gt;JarFile&lt;/code&gt; to read from the specified
-            &lt;code&gt;File&lt;/code&gt; object in the specified mode.</summary>
+        <summary>Creates a new <c>JarFile</c> to read from the specified
+            <c>File</c> object in the specified mode.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -1018,10 +1018,10 @@
       </Parameters>
       <Docs>
         <param name="name">the jar file entry name</param>
-        <summary>Returns the &lt;code&gt;JarEntry&lt;/code&gt; for the given entry name or
-            &lt;code&gt;null&lt;/code&gt; if not found.</summary>
-        <returns>the &lt;code&gt;JarEntry&lt;/code&gt; for the given entry name or
-                    &lt;code&gt;null&lt;/code&gt; if not found.</returns>
+        <summary>Returns the <c>JarEntry</c> for the given entry name or
+            <c>null</c> if not found.</summary>
+        <returns>the <c>JarEntry</c> for the given entry name or
+                    <c>null</c> if not found.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1363,8 +1363,8 @@
         <ReturnType>Java.Util.Jar.Manifest</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Returns the jar file manifest, or &lt;code&gt;null&lt;/code&gt; if none.</summary>
-        <value>the jar file manifest, or &lt;code&gt;null&lt;/code&gt; if none</value>
+        <summary>Returns the jar file manifest, or <c>null</c> if none.</summary>
+        <value>the jar file manifest, or <c>null</c> if none</value>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.Util.Jar/JarInputStream.xml b/docs/Mono.Android/en/Java.Util.Jar/JarInputStream.xml
index 1ab766d12e..26c95d904a 100644
--- a/docs/Mono.Android/en/Java.Util.Jar/JarInputStream.xml
+++ b/docs/Mono.Android/en/Java.Util.Jar/JarInputStream.xml
@@ -18,7 +18,7 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>The &lt;code&gt;JarInputStream&lt;/code&gt; class is used to read the contents of
+    <summary>The <c>JarInputStream</c> class is used to read the contents of
             a JAR file from any input stream.</summary>
     <remarks>
       <para>
@@ -56,7 +56,7 @@
       </Parameters>
       <Docs>
         <param name="in">the actual input stream</param>
-        <summary>Creates a new &lt;code&gt;JarInputStream&lt;/code&gt; and reads the optional
+        <summary>Creates a new <c>JarInputStream</c> and reads the optional
             manifest.</summary>
         <remarks>
           <para>
@@ -122,7 +122,7 @@
         <param name="in">the actual input stream</param>
         <param name="verify">whether or not to verify the JarInputStream if
             it is signed.</param>
-        <summary>Creates a new &lt;code&gt;JarInputStream&lt;/code&gt; and reads the optional
+        <summary>Creates a new <c>JarInputStream</c> and reads the optional
             manifest.</summary>
         <remarks>
           <para>
@@ -1192,10 +1192,10 @@
         <ReturnType>Java.Util.Jar.Manifest</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Returns the &lt;code&gt;Manifest&lt;/code&gt; for this JAR file, or
-            &lt;code&gt;null&lt;/code&gt; if none.</summary>
-        <value>the &lt;code&gt;Manifest&lt;/code&gt; for this JAR file, or
-                    &lt;code&gt;null&lt;/code&gt; if none.</value>
+        <summary>Returns the <c>Manifest</c> for this JAR file, or
+            <c>null</c> if none.</summary>
+        <value>the <c>Manifest</c> for this JAR file, or
+                    <c>null</c> if none.</value>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.Util.Jar/JarOutputStream.xml b/docs/Mono.Android/en/Java.Util.Jar/JarOutputStream.xml
index 8105f91583..173736c3d3 100644
--- a/docs/Mono.Android/en/Java.Util.Jar/JarOutputStream.xml
+++ b/docs/Mono.Android/en/Java.Util.Jar/JarOutputStream.xml
@@ -18,7 +18,7 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>The &lt;code&gt;JarOutputStream&lt;/code&gt; class is used to write the contents
+    <summary>The <c>JarOutputStream</c> class is used to write the contents
             of a JAR file to any output stream.</summary>
     <remarks>
       <para>
@@ -56,7 +56,7 @@
       </Parameters>
       <Docs>
         <param name="out">the actual output stream</param>
-        <summary>Creates a new &lt;code&gt;JarOutputStream&lt;/code&gt; with no manifest.</summary>
+        <summary>Creates a new <c>JarOutputStream</c> with no manifest.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -119,9 +119,9 @@
       </Parameters>
       <Docs>
         <param name="out">the actual output stream</param>
-        <param name="man">the optional &lt;code&gt;Manifest&lt;/code&gt;</param>
-        <summary>Creates a new &lt;code&gt;JarOutputStream&lt;/code&gt; with the specified
-            &lt;code&gt;Manifest&lt;/code&gt;.</summary>
+        <param name="man">the optional <c>Manifest</c></param>
+        <summary>Creates a new <c>JarOutputStream</c> with the specified
+            <c>Manifest</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.Util.Logging/Level.xml b/docs/Mono.Android/en/Java.Util.Logging/Level.xml
index 951942250f..9eeab0aede 100644
--- a/docs/Mono.Android/en/Java.Util.Logging/Level.xml
+++ b/docs/Mono.Android/en/Java.Util.Logging/Level.xml
@@ -590,7 +590,7 @@
         <param name="name">string to be parsed</param>
         <summary>Parse a level name string into a Level.</summary>
         <returns>The parsed value. Passing an integer that corresponds to a known name
-            (e.g., 700) will return the associated name (e.g., &lt;CODE&gt;CONFIG&lt;/CODE&gt;).
+            (e.g., 700) will return the associated name (e.g., <c>CONFIG</c>).
             Passing an integer that does not (e.g., 1) will return a new level name
             initialized to that value.</returns>
         <remarks>
diff --git a/docs/Mono.Android/en/Java.Util.Prefs/NodeChangeEvent.xml b/docs/Mono.Android/en/Java.Util.Prefs/NodeChangeEvent.xml
index a8896447b9..bf240acf16 100644
--- a/docs/Mono.Android/en/Java.Util.Prefs/NodeChangeEvent.xml
+++ b/docs/Mono.Android/en/Java.Util.Prefs/NodeChangeEvent.xml
@@ -71,7 +71,7 @@
       <Docs>
         <param name="parent">The parent of the node that was added or removed.</param>
         <param name="child">The node that was added or removed.</param>
-        <summary>Constructs a new &lt;code&gt;NodeChangeEvent&lt;/code&gt; instance.</summary>
+        <summary>Constructs a new <c>NodeChangeEvent</c> instance.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.Util.Prefs/PreferenceChangeEvent.xml b/docs/Mono.Android/en/Java.Util.Prefs/PreferenceChangeEvent.xml
index 8089f3538d..fb83a217e4 100644
--- a/docs/Mono.Android/en/Java.Util.Prefs/PreferenceChangeEvent.xml
+++ b/docs/Mono.Android/en/Java.Util.Prefs/PreferenceChangeEvent.xml
@@ -97,7 +97,7 @@
         <param name="key">The key of the preference that was changed.</param>
         <param name="newValue">The new value of the preference, or <c>null</c>
                              if the preference is being removed.</param>
-        <summary>Constructs a new &lt;code&gt;PreferenceChangeEvent&lt;/code&gt; instance.</summary>
+        <summary>Constructs a new <c>PreferenceChangeEvent</c> instance.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.Util.Regex/Matcher.xml b/docs/Mono.Android/en/Java.Util.Regex/Matcher.xml
index 3c54ff3890..e0b17f1b99 100644
--- a/docs/Mono.Android/en/Java.Util.Regex/Matcher.xml
+++ b/docs/Mono.Android/en/Java.Util.Regex/Matcher.xml
@@ -830,8 +830,8 @@
       </Parameters>
       <Docs>
         <param name="s">The string to be literalized</param>
-        <summary>Returns a literal replacement &lt;code&gt;String&lt;/code&gt; for the specified
-            &lt;code&gt;String&lt;/code&gt;.</summary>
+        <summary>Returns a literal replacement <c>String</c> for the specified
+            <c>String</c>.</summary>
         <returns>A literal string replacement</returns>
         <remarks>
           <para>
@@ -1427,7 +1427,7 @@
       <Parameters />
       <Docs>
         <summary>Returns the match state of this matcher as a <c>MatchResult</c>.</summary>
-        <returns>a &lt;code&gt;MatchResult&lt;/code&gt; with the state of this matcher</returns>
+        <returns>a <c>MatchResult</c> with the state of this matcher</returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.Util.Regex/Pattern.xml b/docs/Mono.Android/en/Java.Util.Regex/Pattern.xml
index 28f57f07dc..0fbc3601ca 100644
--- a/docs/Mono.Android/en/Java.Util.Regex/Pattern.xml
+++ b/docs/Mono.Android/en/Java.Util.Regex/Pattern.xml
@@ -732,8 +732,8 @@
       </Parameters>
       <Docs>
         <param name="s">The string to be literalized</param>
-        <summary>Returns a literal pattern &lt;code&gt;String&lt;/code&gt; for the specified
-            &lt;code&gt;String&lt;/code&gt;.</summary>
+        <summary>Returns a literal pattern <c>String</c> for the specified
+            <c>String</c>.</summary>
         <returns>A literal string replacement</returns>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Zip/ZipException.xml b/docs/Mono.Android/en/Java.Util.Zip/ZipException.xml
index c7ecd60440..f1e4e910d0 100644
--- a/docs/Mono.Android/en/Java.Util.Zip/ZipException.xml
+++ b/docs/Mono.Android/en/Java.Util.Zip/ZipException.xml
@@ -51,7 +51,7 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <summary>Constructs a &lt;code&gt;ZipException&lt;/code&gt; with &lt;code&gt;null&lt;/code&gt;
+        <summary>Constructs a <c>ZipException</c> with <c>null</c>
             as its error detail message.</summary>
         <remarks>
           <para>
@@ -89,7 +89,7 @@
       </Parameters>
       <Docs>
         <param name="s">the detail message.</param>
-        <summary>Constructs a &lt;code&gt;ZipException&lt;/code&gt; with the specified detail
+        <summary>Constructs a <c>ZipException</c> with the specified detail
             message.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Zip/ZipFile.xml b/docs/Mono.Android/en/Java.Util.Zip/ZipFile.xml
index f23eeeb0f9..2b3d0611f9 100644
--- a/docs/Mono.Android/en/Java.Util.Zip/ZipFile.xml
+++ b/docs/Mono.Android/en/Java.Util.Zip/ZipFile.xml
@@ -191,8 +191,8 @@
       <Docs>
         <param name="file">the ZIP file to be opened for reading</param>
         <param name="mode">the mode in which the file is to be opened</param>
-        <summary>Opens a new &lt;code&gt;ZipFile&lt;/code&gt; to read from the specified
-            &lt;code&gt;File&lt;/code&gt; object in the specified mode.</summary>
+        <summary>Opens a new <c>ZipFile</c> to read from the specified
+            <c>File</c> object in the specified mode.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -302,8 +302,8 @@
                    be used to decode the ZIP entry name and comment that are not
                    encoded by using UTF-8 encoding (indicated by entry's general
                    purpose flag).</param>
-        <summary>Opens a new &lt;code&gt;ZipFile&lt;/code&gt; to read from the specified
-            &lt;code&gt;File&lt;/code&gt; object in the specified mode.</summary>
+        <summary>Opens a new <c>ZipFile</c> to read from the specified
+            <c>File</c> object in the specified mode.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.Util.Zip/ZipInputStream.xml b/docs/Mono.Android/en/Java.Util.Zip/ZipInputStream.xml
index f25bf18552..2a44ca3ad0 100644
--- a/docs/Mono.Android/en/Java.Util.Zip/ZipInputStream.xml
+++ b/docs/Mono.Android/en/Java.Util.Zip/ZipInputStream.xml
@@ -660,7 +660,7 @@
       </Parameters>
       <Docs>
         <param name="name">the ZIP file entry name</param>
-        <summary>Creates a new &lt;code&gt;ZipEntry&lt;/code&gt; object for the specified
+        <summary>Creates a new <c>ZipEntry</c> object for the specified
             entry name.</summary>
         <returns>the ZipEntry just created</returns>
         <remarks>
diff --git a/docs/Mono.Android/en/Java.Util/AbstractSequentialList.xml b/docs/Mono.Android/en/Java.Util/AbstractSequentialList.xml
index eca4cd564b..fe74f4a80d 100644
--- a/docs/Mono.Android/en/Java.Util/AbstractSequentialList.xml
+++ b/docs/Mono.Android/en/Java.Util/AbstractSequentialList.xml
@@ -192,7 +192,7 @@
       </Parameters>
       <Docs>
         <param name="index">index of first element to be returned from the list
-                    iterator (by a call to the &lt;code&gt;next&lt;/code&gt; method)</param>
+                    iterator (by a call to the <c>next</c> method)</param>
         <summary>Returns a list iterator over the elements in this list (in proper
             sequence).</summary>
         <returns>a list iterator over the elements in this list (in proper
diff --git a/docs/Mono.Android/en/Java.Util/Calendar.xml b/docs/Mono.Android/en/Java.Util/Calendar.xml
index 8669a02772..591c9890e7 100644
--- a/docs/Mono.Android/en/Java.Util/Calendar.xml
+++ b/docs/Mono.Android/en/Java.Util/Calendar.xml
@@ -37,9 +37,9 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>The &lt;code&gt;Calendar&lt;/code&gt; class is an abstract class that provides methods
-            for converting between a specific instant in time and a set of <c>#fields calendar fields</c> such as &lt;code&gt;YEAR&lt;/code&gt;, &lt;code&gt;MONTH&lt;/code&gt;,
-            &lt;code&gt;DAY_OF_MONTH&lt;/code&gt;, &lt;code&gt;HOUR&lt;/code&gt;, and so on, and for
+    <summary>The <c>Calendar</c> class is an abstract class that provides methods
+            for converting between a specific instant in time and a set of <c>#fields calendar fields</c> such as <c>YEAR</c>, <c>MONTH</c>,
+            <c>DAY_OF_MONTH</c>, <c>HOUR</c>, and so on, and for
             manipulating the calendar fields, such as getting the date of the next
             week.</summary>
     <remarks>
@@ -229,12 +229,13 @@
         <Parameter Name="when" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="when">the &lt;code&gt;Object&lt;/code&gt; to be compared</param>
-        <summary>Returns whether this &lt;code&gt;Calendar&lt;/code&gt; represents a time
+        <param name="when">the <c>Object</c> to be compared</param>
+        <summary>Returns whether this <c>Calendar</c> represents a time
             after the time represented by the specified
-            &lt;code&gt;Object&lt;/code&gt;.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if the time of this &lt;code&gt;Calendar&lt;/code&gt; is
-            after the time represented by &lt;code&gt;when&lt;/code&gt;; &lt;code&gt;false&lt;/code&gt;
+            <c>Object</c>.</summary>
+        <returns>
+          <c>true</c> if the time of this <c>Calendar</c> is
+            after the time represented by <c>when</c>; <c>false</c>
             otherwise.</returns>
         <remarks>
           <para>
@@ -359,8 +360,8 @@
       </ReturnValue>
       <MemberValue>9</MemberValue>
       <Docs>
-        <summary>Field number for &lt;code&gt;get&lt;/code&gt; and &lt;code&gt;set&lt;/code&gt; indicating
-            whether the &lt;code&gt;HOUR&lt;/code&gt; is before or after noon.</summary>
+        <summary>Field number for <c>get</c> and <c>set</c> indicating
+            whether the <c>HOUR</c> is before or after noon.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -437,7 +438,7 @@
         <ReturnType>System.Boolean</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>True if &lt;code&gt;fields[]&lt;/code&gt; are in sync with the currently set time.</summary>
+        <summary>True if <c>fields[]</c> are in sync with the currently set time.</summary>
         <value>To be added.</value>
         <remarks>
           <para>
@@ -552,13 +553,14 @@
         <Parameter Name="when" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="when">the &lt;code&gt;Object&lt;/code&gt; to be compared</param>
-        <summary>Returns whether this &lt;code&gt;Calendar&lt;/code&gt; represents a time
+        <param name="when">the <c>Object</c> to be compared</param>
+        <summary>Returns whether this <c>Calendar</c> represents a time
             before the time represented by the specified
-            &lt;code&gt;Object&lt;/code&gt;.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if the time of this
-            &lt;code&gt;Calendar&lt;/code&gt; is before the time represented by
-            &lt;code&gt;when&lt;/code&gt;; &lt;code&gt;false&lt;/code&gt; otherwise.</returns>
+            <c>Object</c>.</summary>
+        <returns>
+          <c>true</c> if the time of this
+            <c>Calendar</c> is before the time represented by
+            <c>when</c>; <c>false</c> otherwise.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -637,7 +639,7 @@
       <Docs>
         <summary>Sets all the calendar field values and the time value
             (millisecond offset from the "#Epoch"&gt;Epoch) of
-            this &lt;code&gt;Calendar&lt;/code&gt; undefined.</summary>
+            this <c>Calendar</c> undefined.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -686,7 +688,7 @@
         <param name="field">the calendar field to be cleared.</param>
         <summary>Sets the given calendar field value and the time value
             (millisecond offset from the "#Epoch"&gt;Epoch) of
-            this &lt;code&gt;Calendar&lt;/code&gt; undefined.</summary>
+            this <c>Calendar</c> undefined.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -763,14 +765,14 @@
         <Parameter Name="anotherCalendar" Type="Java.Util.Calendar" />
       </Parameters>
       <Docs>
-        <param name="anotherCalendar">the &lt;code&gt;Calendar&lt;/code&gt; to be compared.</param>
+        <param name="anotherCalendar">the <c>Calendar</c> to be compared.</param>
         <summary>Compares the time values (millisecond offsets from the "#Epoch"&gt;Epoch) represented by two
-            &lt;code&gt;Calendar&lt;/code&gt; objects.</summary>
-        <returns>the value &lt;code&gt;0&lt;/code&gt; if the time represented by the argument
-            is equal to the time represented by this &lt;code&gt;Calendar&lt;/code&gt;; a value
-            less than &lt;code&gt;0&lt;/code&gt; if the time of this &lt;code&gt;Calendar&lt;/code&gt; is
+            <c>Calendar</c> objects.</summary>
+        <returns>the value <c>0</c> if the time represented by the argument
+            is equal to the time represented by this <c>Calendar</c>; a value
+            less than <c>0</c> if the time of this <c>Calendar</c> is
             before the time represented by the argument; and a value greater than
-            &lt;code&gt;0&lt;/code&gt; if the time of this &lt;code&gt;Calendar&lt;/code&gt; is after the
+            <c>0</c> if the time of this <c>Calendar</c> is after the
             time represented by the argument.</returns>
         <remarks>
           <para>
@@ -936,7 +938,7 @@
       </ReturnValue>
       <MemberValue>5</MemberValue>
       <Docs>
-        <summary>Field number for &lt;code&gt;get&lt;/code&gt; and &lt;code&gt;set&lt;/code&gt; indicating the
+        <summary>Field number for <c>get</c> and <c>set</c> indicating the
             day of the month.</summary>
         <remarks>
           <para>
@@ -979,7 +981,7 @@
       </ReturnValue>
       <MemberValue>5</MemberValue>
       <Docs>
-        <summary>Field number for &lt;code&gt;get&lt;/code&gt; and &lt;code&gt;set&lt;/code&gt; indicating the
+        <summary>Field number for <c>get</c> and <c>set</c> indicating the
             day of the month.</summary>
         <remarks>
           <para>
@@ -1022,7 +1024,7 @@
       </ReturnValue>
       <MemberValue>7</MemberValue>
       <Docs>
-        <summary>Field number for &lt;code&gt;get&lt;/code&gt; and &lt;code&gt;set&lt;/code&gt; indicating the day
+        <summary>Field number for <c>get</c> and <c>set</c> indicating the day
             of the week.</summary>
         <remarks>
           <para>
@@ -1071,7 +1073,7 @@
       </ReturnValue>
       <MemberValue>8</MemberValue>
       <Docs>
-        <summary>Field number for &lt;code&gt;get&lt;/code&gt; and &lt;code&gt;set&lt;/code&gt; indicating the
+        <summary>Field number for <c>get</c> and <c>set</c> indicating the
             ordinal number of the day of the week within the current month.</summary>
         <remarks>
           <para>
@@ -1115,7 +1117,7 @@
       </ReturnValue>
       <MemberValue>6</MemberValue>
       <Docs>
-        <summary>Field number for &lt;code&gt;get&lt;/code&gt; and &lt;code&gt;set&lt;/code&gt; indicating the day
+        <summary>Field number for <c>get</c> and <c>set</c> indicating the day
             number within the current year.</summary>
         <remarks>
           <para>
@@ -1195,7 +1197,7 @@
       </ReturnValue>
       <MemberValue>16</MemberValue>
       <Docs>
-        <summary>Field number for &lt;code&gt;get&lt;/code&gt; and &lt;code&gt;set&lt;/code&gt; indicating the
+        <summary>Field number for <c>get</c> and <c>set</c> indicating the
             daylight saving offset in milliseconds.</summary>
         <remarks>
           <para>
@@ -1237,7 +1239,7 @@
       </ReturnValue>
       <MemberValue>0</MemberValue>
       <Docs>
-        <summary>Field number for &lt;code&gt;get&lt;/code&gt; and &lt;code&gt;set&lt;/code&gt; indicating the
+        <summary>Field number for <c>get</c> and <c>set</c> indicating the
             era, e.</summary>
         <remarks>
           <para>
@@ -1315,7 +1317,7 @@
       </ReturnValue>
       <MemberValue>17</MemberValue>
       <Docs>
-        <summary>The number of distinct fields recognized by &lt;code&gt;get&lt;/code&gt; and &lt;code&gt;set&lt;/code&gt;.</summary>
+        <summary>The number of distinct fields recognized by <c>get</c> and <c>set</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -1541,9 +1543,9 @@
         <param name="field">the calendar field</param>
         <summary>Returns the maximum value that the specified calendar field
             could have, given the time value of this
-            &lt;code&gt;Calendar&lt;/code&gt;.</summary>
+            <c>Calendar</c>.</summary>
         <returns>the maximum of the given calendar field for the time
-            value of this &lt;code&gt;Calendar&lt;/code&gt;</returns>
+            value of this <c>Calendar</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1591,9 +1593,9 @@
       <Docs>
         <param name="field">the calendar field</param>
         <summary>Returns the minimum value that the specified calendar field
-            could have, given the time value of this &lt;code&gt;Calendar&lt;/code&gt;.</summary>
+            could have, given the time value of this <c>Calendar</c>.</summary>
         <returns>the minimum of the given calendar field for the time
-            value of this &lt;code&gt;Calendar&lt;/code&gt;</returns>
+            value of this <c>Calendar</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1630,10 +1632,10 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Returns an array of all locales for which the &lt;code&gt;getInstance&lt;/code&gt;
+        <summary>Returns an array of all locales for which the <c>getInstance</c>
             methods of this class can return localized instances.</summary>
         <returns>An array of locales for which localized
-                    &lt;code&gt;Calendar&lt;/code&gt; instances are available.</returns>
+                    <c>Calendar</c> instances are available.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1682,8 +1684,8 @@
         <param name="locale">the locale for the string representation
                    (any calendar types specified by <c>locale</c> are ignored)</param>
         <summary>Returns the string representation of the calendar
-            &lt;code&gt;field&lt;/code&gt; value in the given &lt;code&gt;style&lt;/code&gt; and
-            &lt;code&gt;locale&lt;/code&gt;.</summary>
+            <c>field</c> value in the given <c>style</c> and
+            <c>locale</c>.</summary>
         <returns>the string representation of the given
                    <c>field</c> in the given <c>style</c>, or
                    <c>null</c> if no string representation is
@@ -1791,7 +1793,7 @@
       <Docs>
         <param name="field">the calendar field.</param>
         <summary>Returns the highest minimum value for the given calendar field
-            of this &lt;code&gt;Calendar&lt;/code&gt; instance.</summary>
+            of this <c>Calendar</c> instance.</summary>
         <returns>the highest minimum value for the given calendar field.</returns>
         <remarks>
           <para>
@@ -1965,7 +1967,7 @@
       <Docs>
         <param name="field">the calendar field.</param>
         <summary>Returns the lowest maximum value for the given calendar field
-            of this &lt;code&gt;Calendar&lt;/code&gt; instance.</summary>
+            of this <c>Calendar</c> instance.</summary>
         <returns>the lowest maximum value for the given calendar field.</returns>
         <remarks>
           <para>
@@ -2014,7 +2016,7 @@
       <Docs>
         <param name="field">the calendar field.</param>
         <summary>Returns the maximum value for the given calendar field of this
-            &lt;code&gt;Calendar&lt;/code&gt; instance.</summary>
+            <c>Calendar</c> instance.</summary>
         <returns>the maximum value for the given calendar field.</returns>
         <remarks>
           <para>
@@ -2063,7 +2065,7 @@
       <Docs>
         <param name="field">the calendar field.</param>
         <summary>Returns the minimum value for the given calendar field of this
-            &lt;code&gt;Calendar&lt;/code&gt; instance.</summary>
+            <c>Calendar</c> instance.</summary>
         <returns>the minimum value for the given calendar field.</returns>
         <remarks>
           <para>
@@ -2105,7 +2107,7 @@
       </ReturnValue>
       <MemberValue>10</MemberValue>
       <Docs>
-        <summary>Field number for &lt;code&gt;get&lt;/code&gt; and &lt;code&gt;set&lt;/code&gt; indicating the
+        <summary>Field number for <c>get</c> and <c>set</c> indicating the
             hour of the morning or afternoon.</summary>
         <remarks>
           <para>
@@ -2149,7 +2151,7 @@
       </ReturnValue>
       <MemberValue>11</MemberValue>
       <Docs>
-        <summary>Field number for &lt;code&gt;get&lt;/code&gt; and &lt;code&gt;set&lt;/code&gt; indicating the
+        <summary>Field number for <c>get</c> and <c>set</c> indicating the
             hour of the day.</summary>
         <remarks>
           <para>
@@ -2278,9 +2280,10 @@
         <param name="field">the calendar field to test</param>
         <summary>Determines if the given calendar field has a value set,
             including cases that the value has been set by internal fields
-            calculations triggered by a &lt;code&gt;get&lt;/code&gt; method call.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if the given calendar field has a value set;
-            &lt;code&gt;false&lt;/code&gt; otherwise.</returns>
+            calculations triggered by a <c>get</c> method call.</summary>
+        <returns>
+          <c>true</c> if the given calendar field has a value set;
+            <c>false</c> otherwise.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -2316,7 +2319,7 @@
         <ReturnType>System.Boolean</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>True if then the value of &lt;code&gt;time&lt;/code&gt; is valid.</summary>
+        <summary>True if then the value of <c>time</c> is valid.</summary>
         <value>To be added.</value>
         <remarks>
           <para>
@@ -2571,11 +2574,13 @@
         <ReturnType>System.Boolean</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="lenient">&lt;code&gt;true&lt;/code&gt; if the lenient mode is to be turned
-            on; &lt;code&gt;false&lt;/code&gt; if it is to be turned off.</param>
+        <param name="lenient">
+          <c>true</c> if the lenient mode is to be turned
+            on; <c>false</c> if it is to be turned off.</param>
         <summary>Tells whether date/time interpretation is to be lenient. -or- Specifies whether or not date/time interpretation is to be lenient.</summary>
-        <value>&lt;code&gt;true&lt;/code&gt; if the interpretation mode of this calendar is lenient;
-            &lt;code&gt;false&lt;/code&gt; otherwise.</value>
+        <value>
+          <c>true</c> if the interpretation mode of this calendar is lenient;
+            <c>false</c> otherwise.</value>
         <remarks>
           <para>Property getter documentation:</para>
           <para>
@@ -2818,7 +2823,7 @@
       </ReturnValue>
       <MemberValue>14</MemberValue>
       <Docs>
-        <summary>Field number for &lt;code&gt;get&lt;/code&gt; and &lt;code&gt;set&lt;/code&gt; indicating the
+        <summary>Field number for <c>get</c> and <c>set</c> indicating the
             millisecond within the second.</summary>
         <remarks>
           <para>
@@ -2913,7 +2918,7 @@
       </ReturnValue>
       <MemberValue>12</MemberValue>
       <Docs>
-        <summary>Field number for &lt;code&gt;get&lt;/code&gt; and &lt;code&gt;set&lt;/code&gt; indicating the
+        <summary>Field number for <c>get</c> and <c>set</c> indicating the
             minute within the hour.</summary>
         <remarks>
           <para>
@@ -2993,7 +2998,7 @@
       </ReturnValue>
       <MemberValue>2</MemberValue>
       <Docs>
-        <summary>Field number for &lt;code&gt;get&lt;/code&gt; and &lt;code&gt;set&lt;/code&gt; indicating the
+        <summary>Field number for <c>get</c> and <c>set</c> indicating the
             month.</summary>
         <remarks>
           <para>
@@ -3296,7 +3301,7 @@
       </Parameters>
       <Docs>
         <param name="field">the calendar field.</param>
-        <param name="amount">the signed amount to add to the calendar &lt;code&gt;field&lt;/code&gt;.</param>
+        <param name="amount">the signed amount to add to the calendar <c>field</c>.</param>
         <summary>Adds the specified (signed) amount to the specified calendar field
             without changing larger fields.</summary>
         <remarks>
@@ -3377,7 +3382,7 @@
       </ReturnValue>
       <MemberValue>13</MemberValue>
       <Docs>
-        <summary>Field number for &lt;code&gt;get&lt;/code&gt; and &lt;code&gt;set&lt;/code&gt; indicating the
+        <summary>Field number for <c>get</c> and <c>set</c> indicating the
             second within the minute.</summary>
         <remarks>
           <para>
@@ -3506,12 +3511,12 @@
         <Parameter Name="date" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="year">the value used to set the &lt;code&gt;YEAR&lt;/code&gt; calendar field.</param>
-        <param name="month">the value used to set the &lt;code&gt;MONTH&lt;/code&gt; calendar field.
+        <param name="year">the value used to set the <c>YEAR</c> calendar field.</param>
+        <param name="month">the value used to set the <c>MONTH</c> calendar field.
             Month value is 0-based. e.g., 0 for January.</param>
-        <param name="date">the value used to set the &lt;code&gt;DAY_OF_MONTH&lt;/code&gt; calendar field.</param>
-        <summary>Sets the values for the calendar fields &lt;code&gt;YEAR&lt;/code&gt;,
-            &lt;code&gt;MONTH&lt;/code&gt;, and &lt;code&gt;DAY_OF_MONTH&lt;/code&gt;.</summary>
+        <param name="date">the value used to set the <c>DAY_OF_MONTH</c> calendar field.</param>
+        <summary>Sets the values for the calendar fields <c>YEAR</c>,
+            <c>MONTH</c>, and <c>DAY_OF_MONTH</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -3554,15 +3559,15 @@
         <Parameter Name="minute" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="year">the value used to set the &lt;code&gt;YEAR&lt;/code&gt; calendar field.</param>
-        <param name="month">the value used to set the &lt;code&gt;MONTH&lt;/code&gt; calendar field.
+        <param name="year">the value used to set the <c>YEAR</c> calendar field.</param>
+        <param name="month">the value used to set the <c>MONTH</c> calendar field.
             Month value is 0-based. e.g., 0 for January.</param>
-        <param name="date">the value used to set the &lt;code&gt;DAY_OF_MONTH&lt;/code&gt; calendar field.</param>
-        <param name="hourOfDay">the value used to set the &lt;code&gt;HOUR_OF_DAY&lt;/code&gt; calendar field.</param>
-        <param name="minute">the value used to set the &lt;code&gt;MINUTE&lt;/code&gt; calendar field.</param>
-        <summary>Sets the values for the calendar fields &lt;code&gt;YEAR&lt;/code&gt;,
-            &lt;code&gt;MONTH&lt;/code&gt;, &lt;code&gt;DAY_OF_MONTH&lt;/code&gt;,
-            &lt;code&gt;HOUR_OF_DAY&lt;/code&gt;, and &lt;code&gt;MINUTE&lt;/code&gt;.</summary>
+        <param name="date">the value used to set the <c>DAY_OF_MONTH</c> calendar field.</param>
+        <param name="hourOfDay">the value used to set the <c>HOUR_OF_DAY</c> calendar field.</param>
+        <param name="minute">the value used to set the <c>MINUTE</c> calendar field.</param>
+        <summary>Sets the values for the calendar fields <c>YEAR</c>,
+            <c>MONTH</c>, <c>DAY_OF_MONTH</c>,
+            <c>HOUR_OF_DAY</c>, and <c>MINUTE</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -3606,16 +3611,16 @@
         <Parameter Name="second" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="year">the value used to set the &lt;code&gt;YEAR&lt;/code&gt; calendar field.</param>
-        <param name="month">the value used to set the &lt;code&gt;MONTH&lt;/code&gt; calendar field.
+        <param name="year">the value used to set the <c>YEAR</c> calendar field.</param>
+        <param name="month">the value used to set the <c>MONTH</c> calendar field.
             Month value is 0-based. e.g., 0 for January.</param>
-        <param name="date">the value used to set the &lt;code&gt;DAY_OF_MONTH&lt;/code&gt; calendar field.</param>
-        <param name="hourOfDay">the value used to set the &lt;code&gt;HOUR_OF_DAY&lt;/code&gt; calendar field.</param>
-        <param name="minute">the value used to set the &lt;code&gt;MINUTE&lt;/code&gt; calendar field.</param>
-        <param name="second">the value used to set the &lt;code&gt;SECOND&lt;/code&gt; calendar field.</param>
-        <summary>Sets the values for the fields &lt;code&gt;YEAR&lt;/code&gt;, &lt;code&gt;MONTH&lt;/code&gt;,
-            &lt;code&gt;DAY_OF_MONTH&lt;/code&gt;, &lt;code&gt;HOUR_OF_DAY&lt;/code&gt;, &lt;code&gt;MINUTE&lt;/code&gt;, and
-            &lt;code&gt;SECOND&lt;/code&gt;.</summary>
+        <param name="date">the value used to set the <c>DAY_OF_MONTH</c> calendar field.</param>
+        <param name="hourOfDay">the value used to set the <c>HOUR_OF_DAY</c> calendar field.</param>
+        <param name="minute">the value used to set the <c>MINUTE</c> calendar field.</param>
+        <param name="second">the value used to set the <c>SECOND</c> calendar field.</param>
+        <summary>Sets the values for the fields <c>YEAR</c>, <c>MONTH</c>,
+            <c>DAY_OF_MONTH</c>, <c>HOUR_OF_DAY</c>, <c>MINUTE</c>, and
+            <c>SECOND</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -3958,9 +3963,9 @@
       </ReturnValue>
       <Docs>
         <param name="date">the given Date.</param>
-        <summary>Returns a &lt;code&gt;Date&lt;/code&gt; object representing this
-            &lt;code&gt;Calendar&lt;/code&gt;'s time value (millisecond offset from the "#Epoch"&gt;Epoch"). -or- Sets this Calendar's time with the given &lt;code&gt;Date&lt;/code&gt;.</summary>
-        <value>a &lt;code&gt;Date&lt;/code&gt; representing the time value.</value>
+        <summary>Returns a <c>Date</c> object representing this
+            <c>Calendar</c>'s time value (millisecond offset from the "#Epoch"&gt;Epoch"). -or- Sets this Calendar's time with the given <c>Date</c>.</summary>
+        <value>a <c>Date</c> representing the time value.</value>
         <remarks>
           <para>Property getter documentation:</para>
           <para>
@@ -4226,7 +4231,7 @@
       </ReturnValue>
       <MemberValue>4</MemberValue>
       <Docs>
-        <summary>Field number for &lt;code&gt;get&lt;/code&gt; and &lt;code&gt;set&lt;/code&gt; indicating the
+        <summary>Field number for <c>get</c> and <c>set</c> indicating the
             week number within the current month.</summary>
         <remarks>
           <para>
@@ -4270,7 +4275,7 @@
       </ReturnValue>
       <MemberValue>3</MemberValue>
       <Docs>
-        <summary>Field number for &lt;code&gt;get&lt;/code&gt; and &lt;code&gt;set&lt;/code&gt; indicating the
+        <summary>Field number for <c>get</c> and <c>set</c> indicating the
             week number within the current year.</summary>
         <remarks>
           <para>
@@ -4387,7 +4392,7 @@
       </ReturnValue>
       <MemberValue>1</MemberValue>
       <Docs>
-        <summary>Field number for &lt;code&gt;get&lt;/code&gt; and &lt;code&gt;set&lt;/code&gt; indicating the
+        <summary>Field number for <c>get</c> and <c>set</c> indicating the
             year.</summary>
         <remarks>
           <para>
@@ -4429,7 +4434,7 @@
       </ReturnValue>
       <MemberValue>15</MemberValue>
       <Docs>
-        <summary>Field number for &lt;code&gt;get&lt;/code&gt; and &lt;code&gt;set&lt;/code&gt;
+        <summary>Field number for <c>get</c> and <c>set</c>
             indicating the raw offset from GMT in milliseconds.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util/Currency.xml b/docs/Mono.Android/en/Java.Util/Currency.xml
index 21e2f8e05e..b416490c19 100644
--- a/docs/Mono.Android/en/Java.Util/Currency.xml
+++ b/docs/Mono.Android/en/Java.Util/Currency.xml
@@ -261,11 +261,11 @@
         <Parameter Name="locale" Type="Java.Util.Locale" />
       </Parameters>
       <Docs>
-        <param name="locale">the locale for whose country a &lt;code&gt;Currency&lt;/code&gt;
+        <param name="locale">the locale for whose country a <c>Currency</c>
             instance is needed</param>
-        <summary>Returns the &lt;code&gt;Currency&lt;/code&gt; instance for the country of the
+        <summary>Returns the <c>Currency</c> instance for the country of the
             given locale.</summary>
-        <returns>the &lt;code&gt;Currency&lt;/code&gt; instance for the country of the given
+        <returns>the <c>Currency</c> instance for the country of the given
             locale, or <c>null</c></returns>
         <remarks>
           <para>
@@ -308,8 +308,8 @@
       </Parameters>
       <Docs>
         <param name="currencyCode">the ISO 4217 code of the currency</param>
-        <summary>Returns the &lt;code&gt;Currency&lt;/code&gt; instance for the given currency code.</summary>
-        <returns>the &lt;code&gt;Currency&lt;/code&gt; instance for the given currency code</returns>
+        <summary>Returns the <c>Currency</c> instance for the given currency code.</summary>
+        <returns>the <c>Currency</c> instance for the given currency code</returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.Util/Date.xml b/docs/Mono.Android/en/Java.Util/Date.xml
index c9d33aa58c..9459da60f3 100644
--- a/docs/Mono.Android/en/Java.Util/Date.xml
+++ b/docs/Mono.Android/en/Java.Util/Date.xml
@@ -37,7 +37,7 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>The class &lt;code&gt;Date&lt;/code&gt; represents a specific instant
+    <summary>The class <c>Date</c> represents a specific instant
             in time, with millisecond precision.</summary>
     <remarks>
       <para>
@@ -71,7 +71,7 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <summary>Allocates a &lt;code&gt;Date&lt;/code&gt; object and initializes it so that
+        <summary>Allocates a <c>Date</c> object and initializes it so that
             it represents the time at which it was allocated, measured to the
             nearest millisecond.</summary>
         <remarks>
@@ -110,7 +110,7 @@
       </Parameters>
       <Docs>
         <param name="date">the milliseconds since January 1, 1970, 00:00:00 GMT.</param>
-        <summary>Allocates a &lt;code&gt;Date&lt;/code&gt; object and initializes it to
+        <summary>Allocates a <c>Date</c> object and initializes it to
             represent the specified number of milliseconds since the
             standard base time known as "the epoch", namely January 1,
             1970, 00:00:00 GMT.</summary>
@@ -154,9 +154,9 @@
       </Parameters>
       <Docs>
         <param name="s">a string representation of the date.</param>
-        <summary>Allocates a &lt;code&gt;Date&lt;/code&gt; object and initializes it so that
+        <summary>Allocates a <c>Date</c> object and initializes it so that
             it represents the date and time indicated by the string
-            &lt;code&gt;s&lt;/code&gt;, which is interpreted as if by the
+            <c>s</c>, which is interpreted as if by the
             <c>Date#parse</c> method.</summary>
         <remarks>
           <para>
@@ -225,10 +225,10 @@
         <param name="year">the year minus 1900.</param>
         <param name="month">the month between 0-11.</param>
         <param name="date">the day of the month between 1-31.</param>
-        <summary>Allocates a &lt;code&gt;Date&lt;/code&gt; object and initializes it so that
+        <summary>Allocates a <c>Date</c> object and initializes it so that
             it represents midnight, local time, at the beginning of the day
-            specified by the &lt;code&gt;year&lt;/code&gt;, &lt;code&gt;month&lt;/code&gt;, and
-            &lt;code&gt;date&lt;/code&gt; arguments.</summary>
+            specified by the <c>year</c>, <c>month</c>, and
+            <c>date</c> arguments.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -277,10 +277,10 @@
         <param name="date">the day of the month between 1-31.</param>
         <param name="hrs">the hours between 0-23.</param>
         <param name="min">the minutes between 0-59.</param>
-        <summary>Allocates a &lt;code&gt;Date&lt;/code&gt; object and initializes it so that
+        <summary>Allocates a <c>Date</c> object and initializes it so that
             it represents the instant at the start of the minute specified by
-            the &lt;code&gt;year&lt;/code&gt;, &lt;code&gt;month&lt;/code&gt;, &lt;code&gt;date&lt;/code&gt;,
-            &lt;code&gt;hrs&lt;/code&gt;, and &lt;code&gt;min&lt;/code&gt; arguments, in the local
+            the <c>year</c>, <c>month</c>, <c>date</c>,
+            <c>hrs</c>, and <c>min</c> arguments, in the local
             time zone.</summary>
         <remarks>
           <para>
@@ -332,10 +332,10 @@
         <param name="hrs">the hours between 0-23.</param>
         <param name="min">the minutes between 0-59.</param>
         <param name="sec">the seconds between 0-59.</param>
-        <summary>Allocates a &lt;code&gt;Date&lt;/code&gt; object and initializes it so that
+        <summary>Allocates a <c>Date</c> object and initializes it so that
             it represents the instant at the start of the second specified
-            by the &lt;code&gt;year&lt;/code&gt;, &lt;code&gt;month&lt;/code&gt;, &lt;code&gt;date&lt;/code&gt;,
-            &lt;code&gt;hrs&lt;/code&gt;, &lt;code&gt;min&lt;/code&gt;, and &lt;code&gt;sec&lt;/code&gt; arguments,
+            by the <c>year</c>, <c>month</c>, <c>date</c>,
+            <c>hrs</c>, <c>min</c>, and <c>sec</c> arguments,
             in the local time zone.</summary>
         <remarks>
           <para>
@@ -377,10 +377,11 @@
       <Docs>
         <param name="when">a date.</param>
         <summary>Tests if this date is after the specified date.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if and only if the instant represented
+        <returns>
+          <c>true</c> if and only if the instant represented
                      by this <c>Date</c> object is strictly later than the
                      instant represented by <c>when</c>;
-                     &lt;code&gt;false&lt;/code&gt; otherwise.</returns>
+                     <c>false</c> otherwise.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -421,10 +422,11 @@
       <Docs>
         <param name="when">a date.</param>
         <summary>Tests if this date is before the specified date.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if and only if the instant of time
+        <returns>
+          <c>true</c> if and only if the instant of time
                        represented by this <c>Date</c> object is strictly
                        earlier than the instant represented by <c>when</c>;
-                     &lt;code&gt;false&lt;/code&gt; otherwise.</returns>
+                     <c>false</c> otherwise.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -502,12 +504,12 @@
         <Parameter Name="anotherDate" Type="Java.Util.Date" />
       </Parameters>
       <Docs>
-        <param name="anotherDate">the &lt;code&gt;Date&lt;/code&gt; to be compared.</param>
+        <param name="anotherDate">the <c>Date</c> to be compared.</param>
         <summary>Compares two Dates for ordering.</summary>
-        <returns>the value &lt;code&gt;0&lt;/code&gt; if the argument Date is equal to
-                     this Date; a value less than &lt;code&gt;0&lt;/code&gt; if this Date
+        <returns>the value <c>0</c> if the argument Date is equal to
+                     this Date; a value less than <c>0</c> if this Date
                      is before the Date argument; and a value greater than
-                 &lt;code&gt;0&lt;/code&gt; if this Date is after the Date argument.</returns>
+                 <c>0</c> if this Date is after the Date argument.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1062,8 +1064,8 @@
       <Docs>
         <param name="time">the number of milliseconds.</param>
         <summary>Returns the number of milliseconds since January 1, 1970, 00:00:00 GMT
-            represented by this <c>Date</c> object. -or- Sets this &lt;code&gt;Date&lt;/code&gt; object to represent a point in time that is
-            &lt;code&gt;time&lt;/code&gt; milliseconds after January 1, 1970 00:00:00 GMT.</summary>
+            represented by this <c>Date</c> object. -or- Sets this <c>Date</c> object to represent a point in time that is
+            <c>time</c> milliseconds after January 1, 1970 00:00:00 GMT.</summary>
         <value>the number of milliseconds since January 1, 1970, 00:00:00 GMT
                      represented by this date.</value>
         <remarks>
@@ -1114,7 +1116,7 @@
       <Docs>
         <summary>Returns the offset, measured in minutes, for the local time zone
             relative to UTC that is appropriate for the time represented by
-            this &lt;code&gt;Date&lt;/code&gt; object.</summary>
+            this <c>Date</c> object.</summary>
         <value>the time-zone offset, in minutes, for the current time zone.</value>
         <remarks>
           <para>
@@ -1307,7 +1309,7 @@
         <param name="year">the year value.</param>
         <summary>Returns a value that is the result of subtracting 1900 from the
             year that contains or begins with the instant in time represented
-            by this &lt;code&gt;Date&lt;/code&gt; object, as interpreted in the local
+            by this <c>Date</c> object, as interpreted in the local
             time zone. -or- Sets the year of this <c>Date</c> object to be the specified
             value plus 1900.</summary>
         <value>the year represented by this date, minus 1900.</value>
diff --git a/docs/Mono.Android/en/Java.Util/Dictionary.xml b/docs/Mono.Android/en/Java.Util/Dictionary.xml
index cafe3c211a..223161922e 100644
--- a/docs/Mono.Android/en/Java.Util/Dictionary.xml
+++ b/docs/Mono.Android/en/Java.Util/Dictionary.xml
@@ -22,8 +22,8 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>The &lt;code&gt;Dictionary&lt;/code&gt; class is the abstract parent of any
-            class, such as &lt;code&gt;Hashtable&lt;/code&gt;, which maps keys to values.</summary>
+    <summary>The <c>Dictionary</c> class is the abstract parent of any
+            class, such as <c>Hashtable</c>, which maps keys to values.</summary>
     <remarks>
       <para>
         <format type="text/html">
@@ -160,7 +160,7 @@
       </Parameters>
       <Docs>
         <param name="key">a key in this dictionary.
-                     &lt;code&gt;null&lt;/code&gt; if the key is not mapped to any value in
+                     <c>null</c> if the key is not mapped to any value in
                      this dictionary.</param>
         <summary>Returns the value to which the key is mapped in this dictionary.</summary>
         <returns>the value to which the key is mapped in this dictionary;</returns>
@@ -306,10 +306,10 @@
       <Docs>
         <param name="key">the hashtable key.</param>
         <param name="value">the value.</param>
-        <summary>Maps the specified &lt;code&gt;key&lt;/code&gt; to the specified
-            &lt;code&gt;value&lt;/code&gt; in this dictionary.</summary>
-        <returns>the previous value to which the &lt;code&gt;key&lt;/code&gt; was mapped
-                        in this dictionary, or &lt;code&gt;null&lt;/code&gt; if the key did not
+        <summary>Maps the specified <c>key</c> to the specified
+            <c>value</c> in this dictionary.</summary>
+        <returns>the previous value to which the <c>key</c> was mapped
+                        in this dictionary, or <c>null</c> if the key did not
                         have a previous mapping.</returns>
         <remarks>
           <para>
@@ -349,10 +349,10 @@
       </Parameters>
       <Docs>
         <param name="key">the key that needs to be removed.</param>
-        <summary>Removes the &lt;code&gt;key&lt;/code&gt; (and its corresponding
-            &lt;code&gt;value&lt;/code&gt;) from this dictionary.</summary>
-        <returns>the value to which the &lt;code&gt;key&lt;/code&gt; had been mapped in this
-                     dictionary, or &lt;code&gt;null&lt;/code&gt; if the key did not have a
+        <summary>Removes the <c>key</c> (and its corresponding
+            <c>value</c>) from this dictionary.</summary>
+        <returns>the value to which the <c>key</c> had been mapped in this
+                     dictionary, or <c>null</c> if the key did not have a
                      mapping.</returns>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util/EmptyStackException.xml b/docs/Mono.Android/en/Java.Util/EmptyStackException.xml
index a88bd05f2e..60e4711f81 100644
--- a/docs/Mono.Android/en/Java.Util/EmptyStackException.xml
+++ b/docs/Mono.Android/en/Java.Util/EmptyStackException.xml
@@ -18,7 +18,7 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>Thrown by methods in the &lt;code&gt;Stack&lt;/code&gt; class to indicate
+    <summary>Thrown by methods in the <c>Stack</c> class to indicate
             that the stack is empty.</summary>
     <remarks>
       <para>
@@ -52,7 +52,7 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <summary>Constructs a new &lt;code&gt;EmptyStackException&lt;/code&gt; with <c>null</c>
+        <summary>Constructs a new <c>EmptyStackException</c> with <c>null</c>
             as its error message string.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util/GregorianCalendar.xml b/docs/Mono.Android/en/Java.Util/GregorianCalendar.xml
index 02261d505f..2c9c95b124 100644
--- a/docs/Mono.Android/en/Java.Util/GregorianCalendar.xml
+++ b/docs/Mono.Android/en/Java.Util/GregorianCalendar.xml
@@ -18,8 +18,9 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>&lt;code&gt;GregorianCalendar&lt;/code&gt; is a concrete subclass of
-            &lt;code&gt;Calendar&lt;/code&gt; and provides the standard calendar system
+    <summary>
+      <c>GregorianCalendar</c> is a concrete subclass of
+            <c>Calendar</c> and provides the standard calendar system
             used by most of the world.</summary>
     <remarks>
       <para>
@@ -53,7 +54,7 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <summary>Constructs a default &lt;code&gt;GregorianCalendar&lt;/code&gt; using the current time
+        <summary>Constructs a default <c>GregorianCalendar</c> using the current time
             in the default time zone with the default
             <c>Locale.Category#FORMAT FORMAT</c> locale.</summary>
         <remarks>
@@ -92,7 +93,7 @@
       </Parameters>
       <Docs>
         <param name="aLocale">the given locale.</param>
-        <summary>Constructs a &lt;code&gt;GregorianCalendar&lt;/code&gt; based on the current time
+        <summary>Constructs a <c>GregorianCalendar</c> based on the current time
             in the default time zone with the given locale.</summary>
         <remarks>
           <para>
@@ -130,7 +131,7 @@
       </Parameters>
       <Docs>
         <param name="zone">the given time zone.</param>
-        <summary>Constructs a &lt;code&gt;GregorianCalendar&lt;/code&gt; based on the current time
+        <summary>Constructs a <c>GregorianCalendar</c> based on the current time
             in the given time zone with the default
             <c>Locale.Category#FORMAT FORMAT</c> locale.</summary>
         <remarks>
@@ -171,7 +172,7 @@
       <Docs>
         <param name="zone">the given time zone.</param>
         <param name="aLocale">the given locale.</param>
-        <summary>Constructs a &lt;code&gt;GregorianCalendar&lt;/code&gt; based on the current time
+        <summary>Constructs a <c>GregorianCalendar</c> based on the current time
             in the given time zone with the given locale.</summary>
         <remarks>
           <para>
@@ -233,11 +234,11 @@
         <Parameter Name="dayOfMonth" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="year">the value used to set the &lt;code&gt;YEAR&lt;/code&gt; calendar field in the calendar.</param>
-        <param name="month">the value used to set the &lt;code&gt;MONTH&lt;/code&gt; calendar field in the calendar.
+        <param name="year">the value used to set the <c>YEAR</c> calendar field in the calendar.</param>
+        <param name="month">the value used to set the <c>MONTH</c> calendar field in the calendar.
             Month value is 0-based. e.g., 0 for January.</param>
-        <param name="dayOfMonth">the value used to set the &lt;code&gt;DAY_OF_MONTH&lt;/code&gt; calendar field in the calendar.</param>
-        <summary>Constructs a &lt;code&gt;GregorianCalendar&lt;/code&gt; with the given date set
+        <param name="dayOfMonth">the value used to set the <c>DAY_OF_MONTH</c> calendar field in the calendar.</param>
+        <summary>Constructs a <c>GregorianCalendar</c> with the given date set
             in the default time zone with the default locale.</summary>
         <remarks>
           <para>
@@ -278,15 +279,15 @@
         <Parameter Name="minute" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="year">the value used to set the &lt;code&gt;YEAR&lt;/code&gt; calendar field in the calendar.</param>
-        <param name="month">the value used to set the &lt;code&gt;MONTH&lt;/code&gt; calendar field in the calendar.
+        <param name="year">the value used to set the <c>YEAR</c> calendar field in the calendar.</param>
+        <param name="month">the value used to set the <c>MONTH</c> calendar field in the calendar.
             Month value is 0-based. e.g., 0 for January.</param>
-        <param name="dayOfMonth">the value used to set the &lt;code&gt;DAY_OF_MONTH&lt;/code&gt; calendar field in the calendar.</param>
-        <param name="hourOfDay">the value used to set the &lt;code&gt;HOUR_OF_DAY&lt;/code&gt; calendar field
+        <param name="dayOfMonth">the value used to set the <c>DAY_OF_MONTH</c> calendar field in the calendar.</param>
+        <param name="hourOfDay">the value used to set the <c>HOUR_OF_DAY</c> calendar field
             in the calendar.</param>
-        <param name="minute">the value used to set the &lt;code&gt;MINUTE&lt;/code&gt; calendar field
+        <param name="minute">the value used to set the <c>MINUTE</c> calendar field
             in the calendar.</param>
-        <summary>Constructs a &lt;code&gt;GregorianCalendar&lt;/code&gt; with the given date
+        <summary>Constructs a <c>GregorianCalendar</c> with the given date
             and time set for the default time zone with the default locale.</summary>
         <remarks>
           <para>
@@ -328,15 +329,15 @@
         <Parameter Name="second" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="year">the value used to set the &lt;code&gt;YEAR&lt;/code&gt; calendar field in the calendar.</param>
-        <param name="month">the value used to set the &lt;code&gt;MONTH&lt;/code&gt; calendar field in the calendar.
+        <param name="year">the value used to set the <c>YEAR</c> calendar field in the calendar.</param>
+        <param name="month">the value used to set the <c>MONTH</c> calendar field in the calendar.
             Month value is 0-based. e.g., 0 for January.</param>
-        <param name="dayOfMonth">the value used to set the &lt;code&gt;DAY_OF_MONTH&lt;/code&gt; calendar field in the calendar.</param>
-        <param name="hourOfDay">the value used to set the &lt;code&gt;HOUR_OF_DAY&lt;/code&gt; calendar field
+        <param name="dayOfMonth">the value used to set the <c>DAY_OF_MONTH</c> calendar field in the calendar.</param>
+        <param name="hourOfDay">the value used to set the <c>HOUR_OF_DAY</c> calendar field
             in the calendar.</param>
-        <param name="minute">the value used to set the &lt;code&gt;MINUTE&lt;/code&gt; calendar field
+        <param name="minute">the value used to set the <c>MINUTE</c> calendar field
             in the calendar.</param>
-        <param name="second">the value used to set the &lt;code&gt;SECOND&lt;/code&gt; calendar field
+        <param name="second">the value used to set the <c>SECOND</c> calendar field
             in the calendar.</param>
         <summary>Constructs a GregorianCalendar with the given date
             and time set for the default time zone with the default locale.</summary>
@@ -376,7 +377,7 @@
       </ReturnValue>
       <MemberValue>1</MemberValue>
       <Docs>
-        <summary>Value of the &lt;code&gt;ERA&lt;/code&gt; field indicating
+        <summary>Value of the <c>ERA</c> field indicating
             the common era (Anno Domini), also known as CE.</summary>
         <remarks>
           <para>
@@ -466,7 +467,7 @@
       </ReturnValue>
       <MemberValue>0</MemberValue>
       <Docs>
-        <summary>Value of the &lt;code&gt;ERA&lt;/code&gt; field indicating
+        <summary>Value of the <c>ERA</c> field indicating
             the period before the common era (before Christ), also known as BCE.</summary>
         <remarks>
           <para>
@@ -590,7 +591,7 @@
       <Docs>
         <param name="field">the calendar field.</param>
         <summary>Returns the highest minimum value for the given calendar field
-            of this &lt;code&gt;GregorianCalendar&lt;/code&gt; instance.</summary>
+            of this <c>GregorianCalendar</c> instance.</summary>
         <returns>the highest minimum value for the given calendar field.</returns>
         <remarks>
           <para>
@@ -639,7 +640,7 @@
       <Docs>
         <param name="field">the calendar field</param>
         <summary>Returns the lowest maximum value for the given calendar field
-            of this &lt;code&gt;GregorianCalendar&lt;/code&gt; instance.</summary>
+            of this <c>GregorianCalendar</c> instance.</summary>
         <returns>the lowest maximum value for the given calendar field.</returns>
         <remarks>
           <para>
@@ -688,7 +689,7 @@
       <Docs>
         <param name="field">the calendar field.</param>
         <summary>Returns the maximum value for the given calendar field of this
-            &lt;code&gt;GregorianCalendar&lt;/code&gt; instance.</summary>
+            <c>GregorianCalendar</c> instance.</summary>
         <returns>the maximum value for the given calendar field.</returns>
         <remarks>
           <para>
@@ -737,7 +738,7 @@
       <Docs>
         <param name="field">the calendar field.</param>
         <summary>Returns the minimum value for the given calendar field of this
-            &lt;code&gt;GregorianCalendar&lt;/code&gt; instance.</summary>
+            <c>GregorianCalendar</c> instance.</summary>
         <returns>the minimum value for the given calendar field.</returns>
         <remarks>
           <para>
@@ -779,8 +780,8 @@
       </ReturnValue>
       <Docs>
         <param name="date">the given Gregorian cutover date.</param>
-        <summary>Gets the Gregorian Calendar change date. -or- Sets the &lt;code&gt;GregorianCalendar&lt;/code&gt; change date.</summary>
-        <value>the Gregorian cutover date for this &lt;code&gt;GregorianCalendar&lt;/code&gt; object.</value>
+        <summary>Gets the Gregorian Calendar change date. -or- Sets the <c>GregorianCalendar</c> change date.</summary>
+        <value>the Gregorian cutover date for this <c>GregorianCalendar</c> object.</value>
         <remarks>
           <para>Property getter documentation:</para>
           <para>
@@ -828,7 +829,8 @@
       <Docs>
         <param name="year">the given year.</param>
         <summary>Determines if the given year is a leap year.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if the given year is a leap year; &lt;code&gt;false&lt;/code&gt; otherwise.</returns>
+        <returns>
+          <c>true</c> if the given year is a leap year; <c>false</c> otherwise.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -946,7 +948,7 @@
       <Docs>
         <param name="field">the calendar field.</param>
         <param name="up">indicates if the value of the specified calendar field is to be
-            rolled up or rolled down. Use &lt;code&gt;true&lt;/code&gt; if rolling up, &lt;code&gt;false&lt;/code&gt; otherwise.</param>
+            rolled up or rolled down. Use <c>true</c> if rolling up, <c>false</c> otherwise.</param>
         <summary>Adds or subtracts (up/down) a single unit of time on the given time
             field without changing larger fields.</summary>
         <remarks>
diff --git a/docs/Mono.Android/en/Java.Util/Hashtable.xml b/docs/Mono.Android/en/Java.Util/Hashtable.xml
index 61d97530a7..03b44dc65c 100644
--- a/docs/Mono.Android/en/Java.Util/Hashtable.xml
+++ b/docs/Mono.Android/en/Java.Util/Hashtable.xml
@@ -443,10 +443,11 @@
       <Docs>
         <param name="value">a value to search for</param>
         <summary>Tests if some key maps into the specified value in this hashtable.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if and only if some key maps to the
-                        &lt;code&gt;value&lt;/code&gt; argument in this hashtable as
+        <returns>
+          <c>true</c> if and only if some key maps to the
+                        <c>value</c> argument in this hashtable as
                         determined by the <c>equals</c> method;
-                        &lt;code&gt;false&lt;/code&gt; otherwise.</returns>
+                        <c>false</c> otherwise.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -492,9 +493,10 @@
       <Docs>
         <param name="key">possible key</param>
         <summary>Tests if the specified object is a key in this hashtable.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if and only if the specified object
+        <returns>
+          <c>true</c> if and only if the specified object
                      is a key in this hashtable, as determined by the
-                     <c>equals</c> method; &lt;code&gt;false&lt;/code&gt; otherwise.</returns>
+                     <c>equals</c> method; <c>false</c> otherwise.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -779,8 +781,9 @@
       </ReturnValue>
       <Docs>
         <summary>Tests if this hashtable maps no keys to values.</summary>
-        <value>&lt;code&gt;true&lt;/code&gt; if this hashtable maps no keys to values;
-                     &lt;code&gt;false&lt;/code&gt; otherwise.</value>
+        <value>
+          <c>true</c> if this hashtable maps no keys to values;
+                     <c>false</c> otherwise.</value>
         <remarks>
           <para>
             <format type="text/html">
@@ -980,10 +983,10 @@
       <Docs>
         <param name="key">the hashtable key</param>
         <param name="value">the value</param>
-        <summary>Maps the specified &lt;code&gt;key&lt;/code&gt; to the specified
-            &lt;code&gt;value&lt;/code&gt; in this hashtable.</summary>
+        <summary>Maps the specified <c>key</c> to the specified
+            <c>value</c> in this hashtable.</summary>
         <returns>the previous value of the specified key in this hashtable,
-                        or &lt;code&gt;null&lt;/code&gt; if it did not have one</returns>
+                        or <c>null</c> if it did not have one</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1145,7 +1148,7 @@
         <summary>Removes the key (and its corresponding value) from this
             hashtable.</summary>
         <returns>the value to which the key had been mapped in this hashtable,
-                     or &lt;code&gt;null&lt;/code&gt; if the key did not have a mapping</returns>
+                     or <c>null</c> if the key did not have a mapping</returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.Util/IComparator.xml b/docs/Mono.Android/en/Java.Util/IComparator.xml
index beef65fcb4..3e1c5c5b0b 100644
--- a/docs/Mono.Android/en/Java.Util/IComparator.xml
+++ b/docs/Mono.Android/en/Java.Util/IComparator.xml
@@ -356,7 +356,8 @@
         <param name="obj">the reference object with which to compare.</param>
         <summary>Indicates whether some other object is &amp;quot;equal to&amp;quot; this
             comparator.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; only if the specified object is also
+        <returns>
+          <c>true</c> only if the specified object is also
                      a comparator and it imposes the same ordering as this
                      comparator.</returns>
         <remarks>
diff --git a/docs/Mono.Android/en/Java.Util/IObserver.xml b/docs/Mono.Android/en/Java.Util/IObserver.xml
index 6738df2d95..eb420cf157 100644
--- a/docs/Mono.Android/en/Java.Util/IObserver.xml
+++ b/docs/Mono.Android/en/Java.Util/IObserver.xml
@@ -25,7 +25,7 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>A class can implement the &lt;code&gt;Observer&lt;/code&gt; interface when it
+    <summary>A class can implement the <c>Observer</c> interface when it
             wants to be informed of changes in observable objects.</summary>
     <remarks>
       <para>
@@ -67,7 +67,7 @@
       </Parameters>
       <Docs>
         <param name="o">the observable object.</param>
-        <param name="arg">an argument passed to the &lt;code&gt;notifyObservers&lt;/code&gt;
+        <param name="arg">an argument passed to the <c>notifyObservers</c>
                             method.</param>
         <summary>This method is called whenever the observed object is changed.</summary>
         <remarks>
diff --git a/docs/Mono.Android/en/Java.Util/IllformedLocaleException.xml b/docs/Mono.Android/en/Java.Util/IllformedLocaleException.xml
index 31e2e6ce87..e343bd65f5 100644
--- a/docs/Mono.Android/en/Java.Util/IllformedLocaleException.xml
+++ b/docs/Mono.Android/en/Java.Util/IllformedLocaleException.xml
@@ -51,7 +51,7 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <summary>Constructs a new &lt;code&gt;IllformedLocaleException&lt;/code&gt; with no
+        <summary>Constructs a new <c>IllformedLocaleException</c> with no
             detail message and -1 as the error index.</summary>
         <remarks>
           <para>
@@ -88,7 +88,7 @@
       </Parameters>
       <Docs>
         <param name="message">the message</param>
-        <summary>Constructs a new &lt;code&gt;IllformedLocaleException&lt;/code&gt; with the
+        <summary>Constructs a new <c>IllformedLocaleException</c> with the
             given message and -1 as the error index.</summary>
         <remarks>
           <para>
@@ -150,7 +150,7 @@
       <Docs>
         <param name="message">the message</param>
         <param name="errorIndex">the index</param>
-        <summary>Constructs a new &lt;code&gt;IllformedLocaleException&lt;/code&gt; with the
+        <summary>Constructs a new <c>IllformedLocaleException</c> with the
             given message and the error index.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util/InputMismatchException.xml b/docs/Mono.Android/en/Java.Util/InputMismatchException.xml
index 18f0c5d882..bf05d4876b 100644
--- a/docs/Mono.Android/en/Java.Util/InputMismatchException.xml
+++ b/docs/Mono.Android/en/Java.Util/InputMismatchException.xml
@@ -31,7 +31,7 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>Thrown by a &lt;code&gt;Scanner&lt;/code&gt; to indicate that the token
+    <summary>Thrown by a <c>Scanner</c> to indicate that the token
             retrieved does not match the pattern for the expected type, or
             that the token is out of range for the expected type.</summary>
     <remarks>
@@ -66,7 +66,7 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <summary>Constructs an &lt;code&gt;InputMismatchException&lt;/code&gt; with <c>null</c>
+        <summary>Constructs an <c>InputMismatchException</c> with <c>null</c>
             as its error message string.</summary>
         <remarks>
           <para>
@@ -104,7 +104,7 @@
       </Parameters>
       <Docs>
         <param name="s">the detail message.</param>
-        <summary>Constructs an &lt;code&gt;InputMismatchException&lt;/code&gt;, saving a reference
+        <summary>Constructs an <c>InputMismatchException</c>, saving a reference
             to the error message string <c>s</c> for later retrieval by the
             <c>getMessage</c> method.</summary>
         <remarks>
diff --git a/docs/Mono.Android/en/Java.Util/ListResourceBundle.xml b/docs/Mono.Android/en/Java.Util/ListResourceBundle.xml
index 9f1f30e13f..f85c0fa948 100644
--- a/docs/Mono.Android/en/Java.Util/ListResourceBundle.xml
+++ b/docs/Mono.Android/en/Java.Util/ListResourceBundle.xml
@@ -18,8 +18,9 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>&lt;code&gt;ListResourceBundle&lt;/code&gt; is an abstract subclass of
-            &lt;code&gt;ResourceBundle&lt;/code&gt; that manages resources for a locale
+    <summary>
+      <c>ListResourceBundle</c> is an abstract subclass of
+            <c>ResourceBundle</c> that manages resources for a locale
             in a convenient and easy to use list.</summary>
     <remarks>
       <para>
@@ -114,8 +115,8 @@
       <Parameters />
       <Docs>
         <summary>Returns an array in which each item is a pair of objects in an
-            &lt;code&gt;Object&lt;/code&gt; array.</summary>
-        <returns>an array of an &lt;code&gt;Object&lt;/code&gt; array representing a
+            <c>Object</c> array.</summary>
+        <returns>an array of an <c>Object</c> array representing a
             key-value pair.</returns>
         <remarks>
           <para>
@@ -216,10 +217,10 @@
         <ReturnType>Java.Util.IEnumeration</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Returns an &lt;code&gt;Enumeration&lt;/code&gt; of the keys contained in
-            this &lt;code&gt;ResourceBundle&lt;/code&gt; and its parent bundles.</summary>
-        <value>an &lt;code&gt;Enumeration&lt;/code&gt; of the keys contained in
-                    this &lt;code&gt;ResourceBundle&lt;/code&gt; and its parent bundles.</value>
+        <summary>Returns an <c>Enumeration</c> of the keys contained in
+            this <c>ResourceBundle</c> and its parent bundles.</summary>
+        <value>an <c>Enumeration</c> of the keys contained in
+                    this <c>ResourceBundle</c> and its parent bundles.</value>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.Util/Locale+Builder.xml b/docs/Mono.Android/en/Java.Util/Locale+Builder.xml
index ebba3976cc..1c2eb95b02 100644
--- a/docs/Mono.Android/en/Java.Util/Locale+Builder.xml
+++ b/docs/Mono.Android/en/Java.Util/Locale+Builder.xml
@@ -18,7 +18,8 @@
     </Attribute>
   </Attributes>
   <Docs>
-    <summary>&lt;code&gt;Builder&lt;/code&gt; is used to build instances of &lt;code&gt;Locale&lt;/code&gt;
+    <summary>
+      <c>Builder</c> is used to build instances of <c>Locale</c>
             from values configured by the setters.</summary>
     <remarks>
       <para>
@@ -118,7 +119,7 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Returns an instance of &lt;code&gt;Locale&lt;/code&gt; created from the fields set
+        <summary>Returns an instance of <c>Locale</c> created from the fields set
             on this builder.</summary>
         <returns>A Locale.</returns>
         <remarks>
diff --git a/docs/Mono.Android/en/Java.Util/Locale.xml b/docs/Mono.Android/en/Java.Util/Locale.xml
index 98203683af..b8a6a53edd 100644
--- a/docs/Mono.Android/en/Java.Util/Locale.xml
+++ b/docs/Mono.Android/en/Java.Util/Locale.xml
@@ -34,7 +34,7 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>A &lt;code&gt;Locale&lt;/code&gt; object represents a specific geographical, political,
+    <summary>A <c>Locale</c> object represents a specific geographical, political,
             or cultural region.</summary>
     <remarks>
       <para>
@@ -72,7 +72,7 @@
       </Parameters>
       <Docs>
         <param name="language">An ISO 639 alpha-2 or alpha-3 language code, or a language subtag
-            up to 8 characters in length.  See the &lt;code&gt;Locale&lt;/code&gt; class description about
+            up to 8 characters in length.  See the <c>Locale</c> class description about
             valid language values.</param>
         <summary>Construct a locale from a language code.</summary>
         <remarks>
@@ -112,10 +112,10 @@
       </Parameters>
       <Docs>
         <param name="language">An ISO 639 alpha-2 or alpha-3 language code, or a language subtag
-            up to 8 characters in length.  See the &lt;code&gt;Locale&lt;/code&gt; class description about
+            up to 8 characters in length.  See the <c>Locale</c> class description about
             valid language values.</param>
         <param name="country">An ISO 3166 alpha-2 country code or a UN M.49 numeric-3 area code.
-            See the &lt;code&gt;Locale&lt;/code&gt; class description about valid country values.</param>
+            See the <c>Locale</c> class description about valid country values.</param>
         <summary>Construct a locale from language and country.</summary>
         <remarks>
           <para>
@@ -155,12 +155,12 @@
       </Parameters>
       <Docs>
         <param name="language">An ISO 639 alpha-2 or alpha-3 language code, or a language subtag
-            up to 8 characters in length.  See the &lt;code&gt;Locale&lt;/code&gt; class description about
+            up to 8 characters in length.  See the <c>Locale</c> class description about
             valid language values.</param>
         <param name="country">An ISO 3166 alpha-2 country code or a UN M.49 numeric-3 area code.
-            See the &lt;code&gt;Locale&lt;/code&gt; class description about valid country values.</param>
-        <param name="variant">Any arbitrary value used to indicate a variation of a &lt;code&gt;Locale&lt;/code&gt;.
-            See the &lt;code&gt;Locale&lt;/code&gt; class description for the details.</param>
+            See the <c>Locale</c> class description about valid country values.</param>
+        <param name="variant">Any arbitrary value used to indicate a variation of a <c>Locale</c>.
+            See the <c>Locale</c> class description for the details.</param>
         <summary>Construct a locale from language, country and variant.</summary>
         <remarks>
           <para>
@@ -1990,7 +1990,7 @@
           <c>Locale</c> instances used for matching</param>
         <summary>Returns a <c>Locale</c> instance for the best-matching language
             tag using the lookup mechanism defined in RFC 4647.</summary>
-        <returns>the best matching &lt;code&gt;Locale&lt;/code&gt; instance chosen based on
+        <returns>the best matching <c>Locale</c> instance chosen based on
                 priority or weight, or <c>null</c> if nothing matches.</returns>
         <remarks>
           <para>
@@ -2474,7 +2474,7 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Returns a string representation of this &lt;code&gt;Locale&lt;/code&gt;
+        <summary>Returns a string representation of this <c>Locale</c>
             object, consisting of language, country, variant, script,
             and extensions as below:
             &lt;blockquote&gt;
diff --git a/docs/Mono.Android/en/Java.Util/NoSuchElementException.xml b/docs/Mono.Android/en/Java.Util/NoSuchElementException.xml
index b82c06a51e..efc246f2cf 100644
--- a/docs/Mono.Android/en/Java.Util/NoSuchElementException.xml
+++ b/docs/Mono.Android/en/Java.Util/NoSuchElementException.xml
@@ -52,7 +52,7 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <summary>Constructs a &lt;code&gt;NoSuchElementException&lt;/code&gt; with <c>null</c>
+        <summary>Constructs a <c>NoSuchElementException</c> with <c>null</c>
             as its error message string.</summary>
         <remarks>
           <para>
@@ -90,7 +90,7 @@
       </Parameters>
       <Docs>
         <param name="s">the detail message.</param>
-        <summary>Constructs a &lt;code&gt;NoSuchElementException&lt;/code&gt;, saving a reference
+        <summary>Constructs a <c>NoSuchElementException</c>, saving a reference
             to the error message string <c>s</c> for later retrieval by the
             <c>getMessage</c> method.</summary>
         <remarks>
diff --git a/docs/Mono.Android/en/Java.Util/Observable.xml b/docs/Mono.Android/en/Java.Util/Observable.xml
index 3c78f35af5..3b35dac151 100644
--- a/docs/Mono.Android/en/Java.Util/Observable.xml
+++ b/docs/Mono.Android/en/Java.Util/Observable.xml
@@ -307,10 +307,11 @@
       </ReturnValue>
       <Docs>
         <summary>Tests if this object has changed.</summary>
-        <value>&lt;code&gt;true&lt;/code&gt; if and only if the &lt;code&gt;setChanged&lt;/code&gt;
+        <value>
+          <c>true</c> if and only if the <c>setChanged</c>
                      method has been called more recently than the
-                     &lt;code&gt;clearChanged&lt;/code&gt; method on this object;
-                     &lt;code&gt;false&lt;/code&gt; otherwise.</value>
+                     <c>clearChanged</c> method on this object;
+                     <c>false</c> otherwise.</value>
         <remarks>
           <para>
             <format type="text/html">
@@ -379,8 +380,8 @@
       <Parameters />
       <Docs>
         <summary>If this object has changed, as indicated by the
-            &lt;code&gt;hasChanged&lt;/code&gt; method, then notify all of its observers
-            and then call the &lt;code&gt;clearChanged&lt;/code&gt; method to
+            <c>hasChanged</c> method, then notify all of its observers
+            and then call the <c>clearChanged</c> method to
             indicate that this object has no longer changed.</summary>
         <remarks>
           <para>
@@ -422,8 +423,8 @@
       <Docs>
         <param name="arg">any object.</param>
         <summary>If this object has changed, as indicated by the
-            &lt;code&gt;hasChanged&lt;/code&gt; method, then notify all of its observers
-            and then call the &lt;code&gt;clearChanged&lt;/code&gt; method to indicate
+            <c>hasChanged</c> method, then notify all of its observers
+            and then call the <c>clearChanged</c> method to indicate
             that this object has no longer changed.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util/PropertyResourceBundle.xml b/docs/Mono.Android/en/Java.Util/PropertyResourceBundle.xml
index 44cfff1642..3ac5ea54b5 100644
--- a/docs/Mono.Android/en/Java.Util/PropertyResourceBundle.xml
+++ b/docs/Mono.Android/en/Java.Util/PropertyResourceBundle.xml
@@ -18,8 +18,9 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>&lt;code&gt;PropertyResourceBundle&lt;/code&gt; is a concrete subclass of
-            &lt;code&gt;ResourceBundle&lt;/code&gt; that manages resources for a locale
+    <summary>
+      <c>PropertyResourceBundle</c> is a concrete subclass of
+            <c>ResourceBundle</c> that manages resources for a locale
             using a set of static strings from a property file.</summary>
     <remarks>
       <para>
@@ -226,10 +227,10 @@
         <ReturnType>Java.Util.IEnumeration</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Returns an &lt;code&gt;Enumeration&lt;/code&gt; of the keys contained in
-            this &lt;code&gt;ResourceBundle&lt;/code&gt; and its parent bundles.</summary>
-        <value>an &lt;code&gt;Enumeration&lt;/code&gt; of the keys contained in
-                    this &lt;code&gt;ResourceBundle&lt;/code&gt; and its parent bundles.</value>
+        <summary>Returns an <c>Enumeration</c> of the keys contained in
+            this <c>ResourceBundle</c> and its parent bundles.</summary>
+        <value>an <c>Enumeration</c> of the keys contained in
+                    this <c>ResourceBundle</c> and its parent bundles.</value>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.Util/ResourceBundle+Control.xml b/docs/Mono.Android/en/Java.Util/ResourceBundle+Control.xml
index 91c5caf810..83934bb1ab 100644
--- a/docs/Mono.Android/en/Java.Util/ResourceBundle+Control.xml
+++ b/docs/Mono.Android/en/Java.Util/ResourceBundle+Control.xml
@@ -18,7 +18,11 @@
     </Attribute>
   </Attributes>
   <Docs>
-    <summary>&lt;code&gt;ResourceBundle.</summary>
+    <summary>
+      <c>ResourceBundle.Control</c> defines a set of callback methods
+            that are invoked by the <c>ResourceBundle#getBundle(String,
+            Locale, ClassLoader, Control) ResourceBundle.getBundle</c> factory
+            methods during the bundle loading process.</summary>
     <remarks>
       <para>
         <format type="text/html">
@@ -110,8 +114,8 @@
         <ReturnType>System.Collections.IList</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>The class-only format &lt;code&gt;List&lt;/code&gt; containing
-            &lt;code&gt;"java.</summary>
+        <summary>The class-only format <c>List</c> containing
+            <c>"java.class"</c>.</summary>
         <value>To be added.</value>
         <remarks>
           <para>
@@ -148,8 +152,9 @@
         <ReturnType>System.Collections.IList</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>The default format &lt;code&gt;List&lt;/code&gt;, which contains the strings
-            &lt;code&gt;"java.</summary>
+        <summary>The default format <c>List</c>, which contains the strings
+            <c>"java.class"</c> and <c>"java.properties"</c>, in
+            this order.</summary>
         <value>To be added.</value>
         <remarks>
           <para>
@@ -186,8 +191,8 @@
         <ReturnType>System.Collections.IList</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>The properties-only format &lt;code&gt;List&lt;/code&gt; containing
-            &lt;code&gt;"java.</summary>
+        <summary>The properties-only format <c>List</c> containing
+            <c>"java.properties"</c>.</summary>
         <value>To be added.</value>
         <remarks>
           <para>
@@ -231,10 +236,10 @@
         <param name="baseName">the base name of the resource bundle, a fully
                    qualified class name</param>
         <param name="locale">the locale for which a resource bundle is desired</param>
-        <summary>Returns a &lt;code&gt;List&lt;/code&gt; of &lt;code&gt;Locale&lt;/code&gt;s as candidate
-            locales for &lt;code&gt;baseName&lt;/code&gt; and &lt;code&gt;locale&lt;/code&gt;.</summary>
-        <returns>a &lt;code&gt;List&lt;/code&gt; of candidate
-                   &lt;code&gt;Locale&lt;/code&gt;s for the given &lt;code&gt;locale&lt;/code&gt;</returns>
+        <summary>Returns a <c>List</c> of <c>Locale</c>s as candidate
+            locales for <c>baseName</c> and <c>locale</c>.</summary>
+        <returns>a <c>List</c> of candidate
+                   <c>Locale</c>s for the given <c>locale</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -307,18 +312,18 @@
       <Docs>
         <param name="baseName">the base name of the resource bundle, a fully
                    qualified class name for which
-                   &lt;code&gt;ResourceBundle.getBundle&lt;/code&gt; has been
+                   <c>ResourceBundle.getBundle</c> has been
                    unable to find any resource bundles (except for the
                    base bundle)</param>
-        <param name="locale">the &lt;code&gt;Locale&lt;/code&gt; for which
-                   &lt;code&gt;ResourceBundle.getBundle&lt;/code&gt; has been
+        <param name="locale">the <c>Locale</c> for which
+                   <c>ResourceBundle.getBundle</c> has been
                    unable to find any resource bundles (except for the
                    base bundle)</param>
-        <summary>Returns a &lt;code&gt;Locale&lt;/code&gt; to be used as a fallback locale for
+        <summary>Returns a <c>Locale</c> to be used as a fallback locale for
             further resource bundle searches by the
-            &lt;code&gt;ResourceBundle.</summary>
-        <returns>a &lt;code&gt;Locale&lt;/code&gt; for the fallback search,
-                   or &lt;code&gt;null&lt;/code&gt; if no further fallback search
+            <c>ResourceBundle.getBundle</c> factory method.</summary>
+        <returns>a <c>Locale</c> for the fallback search,
+                   or <c>null</c> if no further fallback search
                    is desired.</returns>
         <remarks>
           <para>
@@ -360,10 +365,10 @@
       <Docs>
         <param name="baseName">the base name of the resource bundle, a fully qualified class
                    name</param>
-        <summary>Returns a &lt;code&gt;List&lt;/code&gt; of &lt;code&gt;String&lt;/code&gt;s containing
+        <summary>Returns a <c>List</c> of <c>String</c>s containing
             formats to be used to load resource bundles for the given
-            &lt;code&gt;baseName&lt;/code&gt;.</summary>
-        <returns>a &lt;code&gt;List&lt;/code&gt; of &lt;code&gt;String&lt;/code&gt;s containing
+            <c>baseName</c>.</summary>
+        <returns>a <c>List</c> of <c>String</c>s containing
                    formats for loading resource bundles.</returns>
         <remarks>
           <para>
@@ -441,7 +446,7 @@
                    expiration value is specified.</param>
         <summary>Returns the time-to-live (TTL) value for resource bundles that
             are loaded under this
-            &lt;code&gt;ResourceBundle.</summary>
+            <c>ResourceBundle.Control</c>.</summary>
         <returns>the time (0 or a positive millisecond offset from the
                    cached time) to get loaded bundles expired in the cache,
                    <c>#TTL_NO_EXPIRATION_CONTROL</c> to disable the
@@ -526,16 +531,17 @@
         <param name="locale">the locale for which the resource bundle
                    should be instantiated</param>
         <param name="format">the resource bundle format to be loaded</param>
-        <param name="loader">the &lt;code&gt;ClassLoader&lt;/code&gt; to use to load the bundle</param>
+        <param name="loader">the <c>ClassLoader</c> to use to load the bundle</param>
         <param name="bundle">the resource bundle instance that has been expired
                    in the cache</param>
-        <param name="loadTime">the time when &lt;code&gt;bundle&lt;/code&gt; was loaded and put
+        <param name="loadTime">the time when <c>bundle</c> was loaded and put
                    in the cache</param>
-        <summary>Determines if the expired &lt;code&gt;bundle&lt;/code&gt; in the cache needs
+        <summary>Determines if the expired <c>bundle</c> in the cache needs
             to be reloaded based on the loading time given by
-            &lt;code&gt;loadTime&lt;/code&gt; or some other criteria.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if the expired bundle needs to be
-                   reloaded; &lt;code&gt;false&lt;/code&gt; otherwise.</returns>
+            <c>loadTime</c> or some other criteria.</summary>
+        <returns>
+          <c>true</c> if the expired bundle needs to be
+                   reloaded; <c>false</c> otherwise.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -583,15 +589,15 @@
         <param name="locale">the locale for which the resource bundle should be
                    instantiated</param>
         <param name="format">the resource bundle format to be loaded</param>
-        <param name="loader">the &lt;code&gt;ClassLoader&lt;/code&gt; to use to load the bundle</param>
-        <param name="reload">the flag to indicate bundle reloading; &lt;code&gt;true&lt;/code&gt;
+        <param name="loader">the <c>ClassLoader</c> to use to load the bundle</param>
+        <param name="reload">the flag to indicate bundle reloading; <c>true</c>
                    if reloading an expired resource bundle,
-                   &lt;code&gt;false&lt;/code&gt; otherwise</param>
+                   <c>false</c> otherwise</param>
         <summary>Instantiates a resource bundle for the given bundle name of the
             given format and locale, using the given class loader if
             necessary.</summary>
         <returns>the resource bundle instance,
-                   or &lt;code&gt;null&lt;/code&gt; if none could be found.</returns>
+                   or <c>null</c> if none could be found.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -701,7 +707,7 @@
                    qualified class name</param>
         <param name="locale">the locale for which a resource bundle should be
                    loaded</param>
-        <summary>Converts the given &lt;code&gt;baseName&lt;/code&gt; and &lt;code&gt;locale&lt;/code&gt;
+        <summary>Converts the given <c>baseName</c> and <c>locale</c>
             to the bundle name.</summary>
         <returns>the bundle name for the resource bundle</returns>
         <remarks>
@@ -745,9 +751,11 @@
       <Docs>
         <param name="bundleName">the bundle name</param>
         <param name="suffix">the file type suffix</param>
-        <summary>Converts the given &lt;code&gt;bundleName&lt;/code&gt; to the form required
+        <summary>Converts the given <c>bundleName</c> to the form required
             by the <c>ClassLoader#getResource ClassLoader.getResource</c>
-            method by replacing all occurrences of &lt;code&gt;'.</summary>
+            method by replacing all occurrences of <c>'.'</c> in
+            <c>bundleName</c> with <c>'/'</c> and appending a
+            <c>'.'</c> and the given file <c>suffix</c>.</summary>
         <returns>the converted resource name</returns>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util/ResourceBundle.xml b/docs/Mono.Android/en/Java.Util/ResourceBundle.xml
index 223a80d984..c42dbfbf5b 100644
--- a/docs/Mono.Android/en/Java.Util/ResourceBundle.xml
+++ b/docs/Mono.Android/en/Java.Util/ResourceBundle.xml
@@ -229,12 +229,13 @@
         <Parameter Name="key" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="key">the resource &lt;code&gt;key&lt;/code&gt;</param>
-        <summary>Determines whether the given &lt;code&gt;key&lt;/code&gt; is contained in
-            this &lt;code&gt;ResourceBundle&lt;/code&gt; or its parent bundles.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if the given &lt;code&gt;key&lt;/code&gt; is
-                   contained in this &lt;code&gt;ResourceBundle&lt;/code&gt; or its
-                   parent bundles; &lt;code&gt;false&lt;/code&gt; otherwise.</returns>
+        <param name="key">the resource <c>key</c></param>
+        <summary>Determines whether the given <c>key</c> is contained in
+            this <c>ResourceBundle</c> or its parent bundles.</summary>
+        <returns>
+          <c>true</c> if the given <c>key</c> is
+                   contained in this <c>ResourceBundle</c> or its
+                   parent bundles; <c>false</c> otherwise.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -719,10 +720,10 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Returns a &lt;code&gt;Set&lt;/code&gt; of the keys contained &lt;em&gt;only&lt;/em&gt;
-            in this &lt;code&gt;ResourceBundle&lt;/code&gt;.</summary>
-        <returns>a &lt;code&gt;Set&lt;/code&gt; of the keys contained only in this
-                   &lt;code&gt;ResourceBundle&lt;/code&gt;</returns>
+        <summary>Returns a <c>Set</c> of the keys contained &lt;em&gt;only&lt;/em&gt;
+            in this <c>ResourceBundle</c>.</summary>
+        <returns>a <c>Set</c> of the keys contained only in this
+                   <c>ResourceBundle</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -818,10 +819,10 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Returns a &lt;code&gt;Set&lt;/code&gt; of all keys contained in this
-            &lt;code&gt;ResourceBundle&lt;/code&gt; and its parent bundles.</summary>
-        <returns>a &lt;code&gt;Set&lt;/code&gt; of all keys contained in this
-                    &lt;code&gt;ResourceBundle&lt;/code&gt; and its parent bundles.</returns>
+        <summary>Returns a <c>Set</c> of all keys contained in this
+            <c>ResourceBundle</c> and its parent bundles.</summary>
+        <returns>a <c>Set</c> of all keys contained in this
+                    <c>ResourceBundle</c> and its parent bundles.</returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Java.Util/Scanner.xml b/docs/Mono.Android/en/Java.Util/Scanner.xml
index 3835b083cc..c68a39b62e 100644
--- a/docs/Mono.Android/en/Java.Util/Scanner.xml
+++ b/docs/Mono.Android/en/Java.Util/Scanner.xml
@@ -72,7 +72,7 @@
       </Parameters>
       <Docs>
         <param name="source">A file to be scanned</param>
-        <summary>Constructs a new &lt;code&gt;Scanner&lt;/code&gt; that produces values scanned
+        <summary>Constructs a new <c>Scanner</c> that produces values scanned
             from the specified file.</summary>
         <remarks>
           <para>
@@ -113,7 +113,7 @@
       <Docs>
         <param name="source">A character source implementing the <c>Readable</c>
                     interface</param>
-        <summary>Constructs a new &lt;code&gt;Scanner&lt;/code&gt; that produces values scanned
+        <summary>Constructs a new <c>Scanner</c> that produces values scanned
             from the specified source.</summary>
         <remarks>
           <para>
@@ -151,7 +151,7 @@
       </Parameters>
       <Docs>
         <param name="source">A channel to scan</param>
-        <summary>Constructs a new &lt;code&gt;Scanner&lt;/code&gt; that produces values scanned
+        <summary>Constructs a new <c>Scanner</c> that produces values scanned
             from the specified channel.</summary>
         <remarks>
           <para>
@@ -189,7 +189,7 @@
       </Parameters>
       <Docs>
         <param name="source">the path to the file to be scanned</param>
-        <summary>Constructs a new &lt;code&gt;Scanner&lt;/code&gt; that produces values scanned
+        <summary>Constructs a new <c>Scanner</c> that produces values scanned
             from the specified file.</summary>
         <remarks>
           <para>
@@ -226,7 +226,7 @@
       </Parameters>
       <Docs>
         <param name="source">An input stream to be scanned</param>
-        <summary>Constructs a new &lt;code&gt;Scanner&lt;/code&gt; that produces values scanned
+        <summary>Constructs a new <c>Scanner</c> that produces values scanned
             from the specified input stream.</summary>
         <remarks>
           <para>
@@ -264,7 +264,7 @@
       </Parameters>
       <Docs>
         <param name="source">A string to scan</param>
-        <summary>Constructs a new &lt;code&gt;Scanner&lt;/code&gt; that produces values scanned
+        <summary>Constructs a new <c>Scanner</c> that produces values scanned
             from the specified string.</summary>
         <remarks>
           <para>
@@ -305,7 +305,7 @@
         <param name="source">A file to be scanned</param>
         <param name="charsetName">The encoding type used to convert bytes from the file
                    into characters to be scanned</param>
-        <summary>Constructs a new &lt;code&gt;Scanner&lt;/code&gt; that produces values scanned
+        <summary>Constructs a new <c>Scanner</c> that produces values scanned
             from the specified file.</summary>
         <remarks>
           <para>
@@ -349,7 +349,7 @@
         <param name="source">A channel to scan</param>
         <param name="charsetName">The encoding type used to convert bytes from the
                    channel into characters to be scanned</param>
-        <summary>Constructs a new &lt;code&gt;Scanner&lt;/code&gt; that produces values scanned
+        <summary>Constructs a new <c>Scanner</c> that produces values scanned
             from the specified channel.</summary>
         <remarks>
           <para>
@@ -392,7 +392,7 @@
         <param name="source">the path to the file to be scanned</param>
         <param name="charsetName">The encoding type used to convert bytes from the file
                      into characters to be scanned</param>
-        <summary>Constructs a new &lt;code&gt;Scanner&lt;/code&gt; that produces values scanned
+        <summary>Constructs a new <c>Scanner</c> that produces values scanned
             from the specified file.</summary>
         <remarks>
           <para>
@@ -432,7 +432,7 @@
         <param name="source">An input stream to be scanned</param>
         <param name="charsetName">The encoding type used to convert bytes from the
                    stream into characters to be scanned</param>
-        <summary>Constructs a new &lt;code&gt;Scanner&lt;/code&gt; that produces values scanned
+        <summary>Constructs a new <c>Scanner</c> that produces values scanned
             from the specified input stream.</summary>
         <remarks>
           <para>
@@ -513,7 +513,7 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Returns the &lt;code&gt;Pattern&lt;/code&gt; this &lt;code&gt;Scanner&lt;/code&gt; is currently
+        <summary>Returns the <c>Pattern</c> this <c>Scanner</c> is currently
             using to match delimiters.</summary>
         <returns>this scanner's delimiting pattern.</returns>
         <remarks>
@@ -775,10 +775,10 @@
       </ReturnValue>
       <Docs>
         <summary>Returns true if the next token in this scanner's input can be
-            interpreted as a &lt;code&gt;BigDecimal&lt;/code&gt; using the
+            interpreted as a <c>BigDecimal</c> using the
             <c>#nextBigDecimal</c> method.</summary>
         <value>true if and only if this scanner's next token is a valid
-                    &lt;code&gt;BigDecimal&lt;/code&gt;</value>
+                    <c>BigDecimal</c></value>
         <remarks>
           <para>
             <format type="text/html">
@@ -817,10 +817,10 @@
       </ReturnValue>
       <Docs>
         <summary>Returns true if the next token in this scanner's input can be
-            interpreted as a &lt;code&gt;BigInteger&lt;/code&gt; in the default radix using the
+            interpreted as a <c>BigInteger</c> in the default radix using the
             <c>#nextBigInteger</c> method.</summary>
         <value>true if and only if this scanner's next token is a valid
-                    &lt;code&gt;BigInteger&lt;/code&gt;</value>
+                    <c>BigInteger</c></value>
         <remarks>
           <para>
             <format type="text/html">
@@ -1285,10 +1285,10 @@
       <Docs>
         <param name="radix">the radix used to interpret the token as an integer</param>
         <summary>Returns true if the next token in this scanner's input can be
-            interpreted as a &lt;code&gt;BigInteger&lt;/code&gt; in the specified radix using
+            interpreted as a <c>BigInteger</c> in the specified radix using
             the <c>#nextBigInteger</c> method.</summary>
         <returns>true if and only if this scanner's next token is a valid
-                    &lt;code&gt;BigInteger&lt;/code&gt;</returns>
+                    <c>BigInteger</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1511,8 +1511,8 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Returns the &lt;code&gt;IOException&lt;/code&gt; last thrown by this
-            &lt;code&gt;Scanner&lt;/code&gt;'s underlying &lt;code&gt;Readable&lt;/code&gt;.</summary>
+        <summary>Returns the <c>IOException</c> last thrown by this
+            <c>Scanner</c>'s underlying <c>Readable</c>.</summary>
         <returns>the last exception thrown by this scanner's readable</returns>
         <remarks>
           <para>
@@ -2526,7 +2526,7 @@
       <Parameters />
       <Docs>
         <summary>The remove operation is not supported by this implementation of
-            &lt;code&gt;Iterator&lt;/code&gt;.</summary>
+            <c>Iterator</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -2798,7 +2798,7 @@
       <Docs>
         <param name="pattern">A string specifying a delimiting pattern</param>
         <summary>Sets this scanner's delimiting pattern to a pattern constructed from
-            the specified &lt;code&gt;String&lt;/code&gt;.</summary>
+            the specified <c>String</c>.</summary>
         <returns>this scanner</returns>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util/SimpleTimeZone.xml b/docs/Mono.Android/en/Java.Util/SimpleTimeZone.xml
index 6cac1cd925..ec95f4c302 100644
--- a/docs/Mono.Android/en/Java.Util/SimpleTimeZone.xml
+++ b/docs/Mono.Android/en/Java.Util/SimpleTimeZone.xml
@@ -18,7 +18,8 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>&lt;code&gt;SimpleTimeZone&lt;/code&gt; is a concrete subclass of &lt;code&gt;TimeZone&lt;/code&gt;
+    <summary>
+      <c>SimpleTimeZone</c> is a concrete subclass of <c>TimeZone</c>
             that represents a time zone for use with a Gregorian calendar.</summary>
     <remarks>
       <para>
@@ -285,7 +286,7 @@
         <param name="startDayOfWeek">The daylight saving time starting day-of-week.
                                    See the class description for the special cases of this parameter.</param>
         <param name="startTime">The daylight saving time starting time in the time mode
-                                   specified by &lt;code&gt;startTimeMode&lt;/code&gt;.</param>
+                                   specified by <c>startTimeMode</c>.</param>
         <param name="startTimeMode">The mode of the start time specified by startTime.</param>
         <param name="endMonth">The daylight saving time ending month. Month is
                                    a <c>Calendar#MONTH MONTH</c> field
@@ -295,7 +296,7 @@
         <param name="endDayOfWeek">The daylight saving time ending day-of-week.
                                    See the class description for the special cases of this parameter.</param>
         <param name="endTime">The daylight saving ending time in time time mode
-                                   specified by &lt;code&gt;endTimeMode&lt;/code&gt;.</param>
+                                   specified by <c>endTimeMode</c>.</param>
         <param name="endTimeMode">The mode of the end time specified by endTime</param>
         <param name="dstSavings">The amount of time in milliseconds saved during
                                    daylight saving time.</param>
@@ -673,10 +674,10 @@
         <param name="endTime">The daylight saving ending time in local wall clock time,
                                    (in milliseconds within the day) which is local daylight
                                    time in this case.</param>
-        <param name="after">If true, this rule selects the first &lt;code&gt;endDayOfWeek&lt;/code&gt; on
-                                   or &lt;em&gt;after&lt;/em&gt; &lt;code&gt;endDay&lt;/code&gt;.  If false, this rule
-                                   selects the last &lt;code&gt;endDayOfWeek&lt;/code&gt; on or before
-                                   &lt;code&gt;endDay&lt;/code&gt; of the month.</param>
+        <param name="after">If true, this rule selects the first <c>endDayOfWeek</c> on
+                                   or &lt;em&gt;after&lt;/em&gt; <c>endDay</c>.  If false, this rule
+                                   selects the last <c>endDayOfWeek</c> on or before
+                                   <c>endDay</c> of the month.</param>
         <summary>Sets the daylight saving time end rule to a weekday before or after the given date within
             a month, e.</summary>
         <remarks>
@@ -827,10 +828,10 @@
         <param name="startDayOfWeek">The daylight saving time starting day-of-week.</param>
         <param name="startTime">The daylight saving time starting time in local wall clock
                                    time, which is local standard time in this case.</param>
-        <param name="after">If true, this rule selects the first &lt;code&gt;dayOfWeek&lt;/code&gt; on or
-                                   &lt;em&gt;after&lt;/em&gt; &lt;code&gt;dayOfMonth&lt;/code&gt;.  If false, this rule
-                                   selects the last &lt;code&gt;dayOfWeek&lt;/code&gt; on or &lt;em&gt;before&lt;/em&gt;
-                                   &lt;code&gt;dayOfMonth&lt;/code&gt;.</param>
+        <param name="after">If true, this rule selects the first <c>dayOfWeek</c> on or
+                                   &lt;em&gt;after&lt;/em&gt; <c>dayOfMonth</c>.  If false, this rule
+                                   selects the last <c>dayOfWeek</c> on or &lt;em&gt;before&lt;/em&gt;
+                                   <c>dayOfMonth</c>.</param>
         <summary>Sets the daylight saving time start rule to a weekday before or after the given date within
             a month, e.</summary>
         <remarks>
diff --git a/docs/Mono.Android/en/Java.Util/Stack.xml b/docs/Mono.Android/en/Java.Util/Stack.xml
index 736da782df..729f2e7589 100644
--- a/docs/Mono.Android/en/Java.Util/Stack.xml
+++ b/docs/Mono.Android/en/Java.Util/Stack.xml
@@ -22,7 +22,7 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>The &lt;code&gt;Stack&lt;/code&gt; class represents a last-in-first-out
+    <summary>The <c>Stack</c> class represents a last-in-first-out
             (LIFO) stack of objects.</summary>
     <remarks>
       <para>
@@ -117,8 +117,9 @@
       <Parameters />
       <Docs>
         <summary>Tests if this stack is empty.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if and only if this stack contains
-                     no items; &lt;code&gt;false&lt;/code&gt; otherwise.</returns>
+        <returns>
+          <c>true</c> if and only if this stack contains
+                     no items; <c>false</c> otherwise.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -274,7 +275,7 @@
       <Docs>
         <param name="item">the item to be pushed onto this stack.</param>
         <summary>Pushes an item onto the top of this stack.</summary>
-        <returns>the &lt;code&gt;item&lt;/code&gt; argument.</returns>
+        <returns>the <c>item</c> argument.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -315,7 +316,7 @@
         <param name="o">the desired object.</param>
         <summary>Returns the 1-based position where an object is on this stack.</summary>
         <returns>the 1-based position from the top of the stack where
-                     the object is located; the return value &lt;code&gt;-1&lt;/code&gt;
+                     the object is located; the return value <c>-1</c>
                      indicates that the object is not on the stack.</returns>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util/StringTokenizer.xml b/docs/Mono.Android/en/Java.Util/StringTokenizer.xml
index ab00f80cfe..9d3f0db4a8 100644
--- a/docs/Mono.Android/en/Java.Util/StringTokenizer.xml
+++ b/docs/Mono.Android/en/Java.Util/StringTokenizer.xml
@@ -211,7 +211,7 @@
       <Parameters />
       <Docs>
         <summary>Calculates the number of times that this tokenizer's
-            &lt;code&gt;nextToken&lt;/code&gt; method can be called before it generates an
+            <c>nextToken</c> method can be called before it generates an
             exception.</summary>
         <returns>the number of tokens remaining in the string using the current
                      delimiter set.</returns>
@@ -253,10 +253,11 @@
         <ReturnType>System.Boolean</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Returns the same value as the &lt;code&gt;hasMoreTokens&lt;/code&gt;
+        <summary>Returns the same value as the <c>hasMoreTokens</c>
             method.</summary>
-        <value>&lt;code&gt;true&lt;/code&gt; if there are more tokens;
-                     &lt;code&gt;false&lt;/code&gt; otherwise.</value>
+        <value>
+          <c>true</c> if there are more tokens;
+                     <c>false</c> otherwise.</value>
         <remarks>
           <para>
             <format type="text/html">
@@ -293,8 +294,9 @@
       </ReturnValue>
       <Docs>
         <summary>Tests if there are more tokens available from this tokenizer's string.</summary>
-        <value>&lt;code&gt;true&lt;/code&gt; if and only if there is at least one token
-                     in the string after the current position; &lt;code&gt;false&lt;/code&gt;
+        <value>
+          <c>true</c> if and only if there is at least one token
+                     in the string after the current position; <c>false</c>
                      otherwise.</value>
         <remarks>
           <para>
@@ -391,9 +393,9 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Returns the same value as the &lt;code&gt;nextToken&lt;/code&gt; method,
-            except that its declared return value is &lt;code&gt;Object&lt;/code&gt; rather than
-            &lt;code&gt;String&lt;/code&gt;.</summary>
+        <summary>Returns the same value as the <c>nextToken</c> method,
+            except that its declared return value is <c>Object</c> rather than
+            <c>String</c>.</summary>
         <returns>the next token in the string.</returns>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util/TimeZone.xml b/docs/Mono.Android/en/Java.Util/TimeZone.xml
index 0bd17caaa2..7c1dced748 100644
--- a/docs/Mono.Android/en/Java.Util/TimeZone.xml
+++ b/docs/Mono.Android/en/Java.Util/TimeZone.xml
@@ -34,7 +34,8 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>&lt;code&gt;TimeZone&lt;/code&gt; represents a time zone offset, and also figures out daylight
+    <summary>
+      <c>TimeZone</c> represents a time zone offset, and also figures out daylight
             savings.</summary>
     <remarks>
       <para>
@@ -128,8 +129,8 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Creates a copy of this &lt;code&gt;TimeZone&lt;/code&gt;.</summary>
-        <returns>a clone of this &lt;code&gt;TimeZone&lt;/code&gt;</returns>
+        <summary>Creates a copy of this <c>TimeZone</c>.</summary>
+        <returns>a clone of this <c>TimeZone</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -170,9 +171,9 @@
       </ReturnValue>
       <Docs>
         <param name="timeZone">the new default <c>TimeZone</c>, or null</param>
-        <summary>Gets the default &lt;code&gt;TimeZone&lt;/code&gt; for this host. -or- Sets the <c>TimeZone</c> that is returned by the <c>getDefault</c>
+        <summary>Gets the default <c>TimeZone</c> for this host. -or- Sets the <c>TimeZone</c> that is returned by the <c>getDefault</c>
             method.</summary>
-        <value>a default &lt;code&gt;TimeZone&lt;/code&gt;.</value>
+        <value>a default <c>TimeZone</c>.</value>
         <remarks>
           <para>Property getter documentation:</para>
           <para>
@@ -619,12 +620,12 @@
         <Parameter Name="id" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="id">the ID for a &lt;code&gt;TimeZone&lt;/code&gt;, either an abbreviation
+        <param name="id">the ID for a <c>TimeZone</c>, either an abbreviation
             such as "PST", a full name such as "America/Los_Angeles", or a custom
             ID such as "GMT-8:00". Note that the support of abbreviations is
             for JDK 1.1.x compatibility only and full names should be used.</param>
-        <summary>Gets the &lt;code&gt;TimeZone&lt;/code&gt; for the given ID.</summary>
-        <returns>the specified &lt;code&gt;TimeZone&lt;/code&gt;, or the GMT zone if the given ID
+        <summary>Gets the <c>TimeZone</c> for the given ID.</summary>
+        <returns>the specified <c>TimeZone</c>, or the GMT zone if the given ID
             cannot be understood.</returns>
         <remarks>
           <para>
@@ -664,7 +665,7 @@
         <Parameter Name="other" Type="Java.Util.TimeZone" />
       </Parameters>
       <Docs>
-        <param name="other">the &lt;code&gt;TimeZone&lt;/code&gt; object to be compared with</param>
+        <param name="other">the <c>TimeZone</c> object to be compared with</param>
         <summary>Returns true if this zone has the same rule and offset as another zone.</summary>
         <returns>true if the other zone is not null and is the same as this one,
             with the possible exception of the ID</returns>
@@ -835,7 +836,7 @@
       </ReturnValue>
       <MemberValue>1</MemberValue>
       <Docs>
-        <summary>A style specifier for &lt;code&gt;getDisplayName()&lt;/code&gt; indicating
+        <summary>A style specifier for <c>getDisplayName()</c> indicating
             a long name, such as "Pacific Standard Time.</summary>
         <remarks>
           <para>
@@ -953,7 +954,7 @@
       </ReturnValue>
       <MemberValue>0</MemberValue>
       <Docs>
-        <summary>A style specifier for &lt;code&gt;getDisplayName()&lt;/code&gt; indicating
+        <summary>A style specifier for <c>getDisplayName()</c> indicating
             a short name, such as "PST.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util/TooManyListenersException.xml b/docs/Mono.Android/en/Java.Util/TooManyListenersException.xml
index b18df721f3..ee81f6d550 100644
--- a/docs/Mono.Android/en/Java.Util/TooManyListenersException.xml
+++ b/docs/Mono.Android/en/Java.Util/TooManyListenersException.xml
@@ -18,7 +18,7 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>The &lt;code&gt; TooManyListenersException &lt;/code&gt; Exception is used as part of
+    <summary>The <c> TooManyListenersException </c> Exception is used as part of
             the Java Event model to annotate and implement a unicast special case of
             a multicast Event Source.</summary>
     <remarks>
diff --git a/docs/Mono.Android/en/Java.Util/Vector.xml b/docs/Mono.Android/en/Java.Util/Vector.xml
index 90c28cafb7..bd9686b8dd 100644
--- a/docs/Mono.Android/en/Java.Util/Vector.xml
+++ b/docs/Mono.Android/en/Java.Util/Vector.xml
@@ -919,7 +919,7 @@
       <Docs>
         <summary>Returns the last component of the vector.</summary>
         <returns>the last component of the vector, i.e., the component at index
-                     &lt;code&gt;size()&amp;nbsp;-&amp;nbsp;1&lt;/code&gt;.</returns>
+                     <c>size()&amp;nbsp;-&amp;nbsp;1</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Javax.Crypto.Interfaces/IDHPrivateKey.xml b/docs/Mono.Android/en/Javax.Crypto.Interfaces/IDHPrivateKey.xml
index fec8f75175..8d52f88a85 100644
--- a/docs/Mono.Android/en/Javax.Crypto.Interfaces/IDHPrivateKey.xml
+++ b/docs/Mono.Android/en/Javax.Crypto.Interfaces/IDHPrivateKey.xml
@@ -74,8 +74,8 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Returns the private value, &lt;code&gt;x&lt;/code&gt;.</summary>
-        <returns>the private value, &lt;code&gt;x&lt;/code&gt;</returns>
+        <summary>Returns the private value, <c>x</c>.</summary>
+        <returns>the private value, <c>x</c></returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Javax.Crypto.Interfaces/IDHPublicKey.xml b/docs/Mono.Android/en/Javax.Crypto.Interfaces/IDHPublicKey.xml
index cd46cfba8e..cd64e9c057 100644
--- a/docs/Mono.Android/en/Javax.Crypto.Interfaces/IDHPublicKey.xml
+++ b/docs/Mono.Android/en/Javax.Crypto.Interfaces/IDHPublicKey.xml
@@ -74,8 +74,8 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Returns the public value, &lt;code&gt;y&lt;/code&gt;.</summary>
-        <returns>the public value, &lt;code&gt;y&lt;/code&gt;</returns>
+        <summary>Returns the public value, <c>y</c>.</summary>
+        <returns>the public value, <c>y</c></returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Javax.Crypto.Spec/DESKeySpec.xml b/docs/Mono.Android/en/Javax.Crypto.Spec/DESKeySpec.xml
index 8f026c58a1..8672b8eab5 100644
--- a/docs/Mono.Android/en/Javax.Crypto.Spec/DESKeySpec.xml
+++ b/docs/Mono.Android/en/Javax.Crypto.Spec/DESKeySpec.xml
@@ -70,7 +70,7 @@
         <param name="key">the buffer with the DES key material. The first 8 bytes
             of the buffer are copied to protect against subsequent modification.</param>
         <summary>Creates a DESKeySpec object using the first 8 bytes in
-            &lt;code&gt;key&lt;/code&gt; as the key material for the DES key.</summary>
+            <c>key</c> as the key material for the DES key.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -110,12 +110,12 @@
       </Parameters>
       <Docs>
         <param name="key">the buffer with the DES key material. The first 8 bytes
-            of the buffer beginning at &lt;code&gt;offset&lt;/code&gt; inclusive are copied
+            of the buffer beginning at <c>offset</c> inclusive are copied
             to protect against subsequent modification.</param>
-        <param name="offset">the offset in &lt;code&gt;key&lt;/code&gt;, where the DES key
+        <param name="offset">the offset in <c>key</c>, where the DES key
             material starts.</param>
         <summary>Creates a DESKeySpec object using the first 8 bytes in
-            &lt;code&gt;key&lt;/code&gt;, beginning at &lt;code&gt;offset&lt;/code&gt; inclusive,
+            <c>key</c>, beginning at <c>offset</c> inclusive,
             as the key material for the DES key.</summary>
         <remarks>
           <para>
@@ -259,9 +259,9 @@
       </Parameters>
       <Docs>
         <param name="key">the buffer with the DES key material.</param>
-        <param name="offset">the offset in &lt;code&gt;key&lt;/code&gt;, where the DES key
+        <param name="offset">the offset in <c>key</c>, where the DES key
             material starts.</param>
-        <summary>Checks if the given DES key material, starting at &lt;code&gt;offset&lt;/code&gt;
+        <summary>Checks if the given DES key material, starting at <c>offset</c>
             inclusive, is parity-adjusted.</summary>
         <returns>true if the given DES key material is parity-adjusted, false
             otherwise.</returns>
@@ -308,7 +308,7 @@
       </Parameters>
       <Docs>
         <param name="key">the buffer with the DES key material.</param>
-        <param name="offset">the offset in &lt;code&gt;key&lt;/code&gt;, where the DES key
+        <param name="offset">the offset in <c>key</c>, where the DES key
             material starts.</param>
         <summary>Checks if the given DES key material is weak or semi-weak.</summary>
         <returns>true if the given DES key material is weak or semi-weak, false
diff --git a/docs/Mono.Android/en/Javax.Crypto.Spec/DESedeKeySpec.xml b/docs/Mono.Android/en/Javax.Crypto.Spec/DESedeKeySpec.xml
index 9cc38e8598..ad48213ec8 100644
--- a/docs/Mono.Android/en/Javax.Crypto.Spec/DESedeKeySpec.xml
+++ b/docs/Mono.Android/en/Javax.Crypto.Spec/DESedeKeySpec.xml
@@ -71,7 +71,7 @@
             24 bytes of the buffer are copied to protect against subsequent
             modification.</param>
         <summary>Creates a DESedeKeySpec object using the first 24 bytes in
-            &lt;code&gt;key&lt;/code&gt; as the key material for the DES-EDE key.</summary>
+            <c>key</c> as the key material for the DES-EDE key.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -112,12 +112,12 @@
       </Parameters>
       <Docs>
         <param name="key">the buffer with the DES-EDE key material. The first
-            24 bytes of the buffer beginning at &lt;code&gt;offset&lt;/code&gt; inclusive
+            24 bytes of the buffer beginning at <c>offset</c> inclusive
             are copied to protect against subsequent modification.</param>
-        <param name="offset">the offset in &lt;code&gt;key&lt;/code&gt;, where the DES-EDE key
+        <param name="offset">the offset in <c>key</c>, where the DES-EDE key
             material starts.</param>
         <summary>Creates a DESedeKeySpec object using the first 24 bytes in
-            &lt;code&gt;key&lt;/code&gt;, beginning at &lt;code&gt;offset&lt;/code&gt; inclusive,
+            <c>key</c>, beginning at <c>offset</c> inclusive,
             as the key material for the DES-EDE key.</summary>
         <remarks>
           <para>
@@ -263,7 +263,7 @@
       <Docs>
         <param name="key">a byte array which holds the key value</param>
         <param name="offset">the offset into the byte array</param>
-        <summary>Checks if the given DES-EDE key, starting at &lt;code&gt;offset&lt;/code&gt;
+        <summary>Checks if the given DES-EDE key, starting at <c>offset</c>
             inclusive, is parity-adjusted.</summary>
         <returns>true if the given DES-EDE key is parity-adjusted, false
             otherwise</returns>
diff --git a/docs/Mono.Android/en/Javax.Crypto.Spec/DHParameterSpec.xml b/docs/Mono.Android/en/Javax.Crypto.Spec/DHParameterSpec.xml
index e485d274e3..dae84d30eb 100644
--- a/docs/Mono.Android/en/Javax.Crypto.Spec/DHParameterSpec.xml
+++ b/docs/Mono.Android/en/Javax.Crypto.Spec/DHParameterSpec.xml
@@ -73,7 +73,7 @@
         <param name="p">the prime modulus</param>
         <param name="g">the base generator</param>
         <summary>Constructs a parameter set for Diffie-Hellman, using a prime modulus
-            &lt;code&gt;p&lt;/code&gt; and a base generator &lt;code&gt;g&lt;/code&gt;.</summary>
+            <c>p</c> and a base generator <c>g</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -138,8 +138,8 @@
         <param name="g">the base generator</param>
         <param name="l">the size in bits of the random exponent (private value)</param>
         <summary>Constructs a parameter set for Diffie-Hellman, using a prime modulus
-            &lt;code&gt;p&lt;/code&gt;, a base generator &lt;code&gt;g&lt;/code&gt;,
-            and the size in bits, &lt;code&gt;l&lt;/code&gt;, of the random exponent
+            <c>p</c>, a base generator <c>g</c>,
+            and the size in bits, <c>l</c>, of the random exponent
             (private value).</summary>
         <remarks>
           <para>
@@ -177,8 +177,8 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Returns the base generator &lt;code&gt;g&lt;/code&gt;.</summary>
-        <returns>the base generator &lt;code&gt;g&lt;/code&gt;</returns>
+        <summary>Returns the base generator <c>g</c>.</summary>
+        <returns>the base generator <c>g</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -215,9 +215,9 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Returns the size in bits, &lt;code&gt;l&lt;/code&gt;, of the random exponent
+        <summary>Returns the size in bits, <c>l</c>, of the random exponent
             (private value).</summary>
-        <returns>the size in bits, &lt;code&gt;l&lt;/code&gt;, of the random exponent
+        <returns>the size in bits, <c>l</c>, of the random exponent
             (private value), or 0 if this size has not been set</returns>
         <remarks>
           <para>
@@ -255,8 +255,8 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Returns the prime modulus &lt;code&gt;p&lt;/code&gt;.</summary>
-        <returns>the prime modulus &lt;code&gt;p&lt;/code&gt;</returns>
+        <summary>Returns the prime modulus <c>p</c>.</summary>
+        <returns>the prime modulus <c>p</c></returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Javax.Crypto.Spec/DHPrivateKeySpec.xml b/docs/Mono.Android/en/Javax.Crypto.Spec/DHPrivateKeySpec.xml
index effdcd66a4..57b15568b2 100644
--- a/docs/Mono.Android/en/Javax.Crypto.Spec/DHPrivateKeySpec.xml
+++ b/docs/Mono.Android/en/Javax.Crypto.Spec/DHPrivateKeySpec.xml
@@ -96,8 +96,8 @@
         <param name="x">private value x</param>
         <param name="p">prime modulus p</param>
         <param name="g">base generator g</param>
-        <summary>Constructor that takes a private value &lt;code&gt;x&lt;/code&gt;, a prime
-            modulus &lt;code&gt;p&lt;/code&gt;, and a base generator &lt;code&gt;g&lt;/code&gt;.</summary>
+        <summary>Constructor that takes a private value <c>x</c>, a prime
+            modulus <c>p</c>, and a base generator <c>g</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -134,8 +134,8 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Returns the base generator &lt;code&gt;g&lt;/code&gt;.</summary>
-        <returns>the base generator &lt;code&gt;g&lt;/code&gt;</returns>
+        <summary>Returns the base generator <c>g</c>.</summary>
+        <returns>the base generator <c>g</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -172,8 +172,8 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Returns the prime modulus &lt;code&gt;p&lt;/code&gt;.</summary>
-        <returns>the prime modulus &lt;code&gt;p&lt;/code&gt;</returns>
+        <summary>Returns the prime modulus <c>p</c>.</summary>
+        <returns>the prime modulus <c>p</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -210,8 +210,8 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Returns the private value &lt;code&gt;x&lt;/code&gt;.</summary>
-        <returns>the private value &lt;code&gt;x&lt;/code&gt;</returns>
+        <summary>Returns the private value <c>x</c>.</summary>
+        <returns>the private value <c>x</c></returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Javax.Crypto.Spec/DHPublicKeySpec.xml b/docs/Mono.Android/en/Javax.Crypto.Spec/DHPublicKeySpec.xml
index 6caee3fc35..4ce5723485 100644
--- a/docs/Mono.Android/en/Javax.Crypto.Spec/DHPublicKeySpec.xml
+++ b/docs/Mono.Android/en/Javax.Crypto.Spec/DHPublicKeySpec.xml
@@ -96,8 +96,8 @@
         <param name="y">public value y</param>
         <param name="p">prime modulus p</param>
         <param name="g">base generator g</param>
-        <summary>Constructor that takes a public value &lt;code&gt;y&lt;/code&gt;, a prime
-            modulus &lt;code&gt;p&lt;/code&gt;, and a base generator &lt;code&gt;g&lt;/code&gt;.</summary>
+        <summary>Constructor that takes a public value <c>y</c>, a prime
+            modulus <c>p</c>, and a base generator <c>g</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -134,8 +134,8 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Returns the base generator &lt;code&gt;g&lt;/code&gt;.</summary>
-        <returns>the base generator &lt;code&gt;g&lt;/code&gt;</returns>
+        <summary>Returns the base generator <c>g</c>.</summary>
+        <returns>the base generator <c>g</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -172,8 +172,8 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Returns the prime modulus &lt;code&gt;p&lt;/code&gt;.</summary>
-        <returns>the prime modulus &lt;code&gt;p&lt;/code&gt;</returns>
+        <summary>Returns the prime modulus <c>p</c>.</summary>
+        <returns>the prime modulus <c>p</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -210,8 +210,8 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Returns the public value &lt;code&gt;y&lt;/code&gt;.</summary>
-        <returns>the public value &lt;code&gt;y&lt;/code&gt;</returns>
+        <summary>Returns the public value <c>y</c>.</summary>
+        <returns>the public value <c>y</c></returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Javax.Crypto.Spec/IvParameterSpec.xml b/docs/Mono.Android/en/Javax.Crypto.Spec/IvParameterSpec.xml
index 40793813d7..ef8938dbfe 100644
--- a/docs/Mono.Android/en/Javax.Crypto.Spec/IvParameterSpec.xml
+++ b/docs/Mono.Android/en/Javax.Crypto.Spec/IvParameterSpec.xml
@@ -69,7 +69,7 @@
       <Docs>
         <param name="iv">the buffer with the IV. The contents of the
             buffer are copied to protect against subsequent modification.</param>
-        <summary>Creates an IvParameterSpec object using the bytes in &lt;code&gt;iv&lt;/code&gt;
+        <summary>Creates an IvParameterSpec object using the bytes in <c>iv</c>
             as the IV.</summary>
         <remarks>
           <para>
@@ -133,14 +133,14 @@
         <Parameter Name="len" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="iv">the buffer with the IV. The first &lt;code&gt;len&lt;/code&gt;
-            bytes of the buffer beginning at &lt;code&gt;offset&lt;/code&gt; inclusive
+        <param name="iv">the buffer with the IV. The first <c>len</c>
+            bytes of the buffer beginning at <c>offset</c> inclusive
             are copied to protect against subsequent modification.</param>
-        <param name="offset">the offset in &lt;code&gt;iv&lt;/code&gt; where the IV
+        <param name="offset">the offset in <c>iv</c> where the IV
             starts.</param>
         <param name="len">the number of IV bytes.</param>
-        <summary>Creates an IvParameterSpec object using the first &lt;code&gt;len&lt;/code&gt;
-            bytes in &lt;code&gt;iv&lt;/code&gt;, beginning at &lt;code&gt;offset&lt;/code&gt;
+        <summary>Creates an IvParameterSpec object using the first <c>len</c>
+            bytes in <c>iv</c>, beginning at <c>offset</c>
             inclusive, as the IV.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Crypto.Spec/OAEPParameterSpec.xml b/docs/Mono.Android/en/Javax.Crypto.Spec/OAEPParameterSpec.xml
index ac470f9b53..b51a8c7d48 100644
--- a/docs/Mono.Android/en/Javax.Crypto.Spec/OAEPParameterSpec.xml
+++ b/docs/Mono.Android/en/Javax.Crypto.Spec/OAEPParameterSpec.xml
@@ -104,10 +104,10 @@
         <param name="pSrc">the source of the encoding input P.</param>
         <summary>Constructs a parameter set for OAEP padding as defined in
             the PKCS #1 standard using the specified message digest
-            algorithm &lt;code&gt;mdName&lt;/code&gt;, mask generation function
-            algorithm &lt;code&gt;mgfName&lt;/code&gt;, parameters for the mask
-            generation function &lt;code&gt;mgfSpec&lt;/code&gt;, and source of
-            the encoding input P &lt;code&gt;pSrc&lt;/code&gt;.</summary>
+            algorithm <c>mdName</c>, mask generation function
+            algorithm <c>mgfName</c>, parameters for the mask
+            generation function <c>mgfSpec</c>, and source of
+            the encoding input P <c>pSrc</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Javax.Crypto.Spec/PBEParameterSpec.xml b/docs/Mono.Android/en/Javax.Crypto.Spec/PBEParameterSpec.xml
index 069ff98b37..17dadbb957 100644
--- a/docs/Mono.Android/en/Javax.Crypto.Spec/PBEParameterSpec.xml
+++ b/docs/Mono.Android/en/Javax.Crypto.Spec/PBEParameterSpec.xml
@@ -71,7 +71,7 @@
         <Parameter Name="iterationCount" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="salt">the salt. The contents of &lt;code&gt;salt&lt;/code&gt; are copied
+        <param name="salt">the salt. The contents of <c>salt</c> are copied
             to protect against subsequent modification.</param>
         <param name="iterationCount">the iteration count.</param>
         <summary>Constructs a parameter set for password-based encryption as defined in
@@ -138,7 +138,7 @@
         <Parameter Name="paramSpec" Type="Java.Security.Spec.IAlgorithmParameterSpec" />
       </Parameters>
       <Docs>
-        <param name="salt">the salt. The contents of &lt;code&gt;salt&lt;/code&gt; are copied
+        <param name="salt">the salt. The contents of <c>salt</c> are copied
             to protect against subsequent modification.</param>
         <param name="iterationCount">the iteration count.</param>
         <param name="paramSpec">the cipher algorithm parameter specification, which
diff --git a/docs/Mono.Android/en/Javax.Crypto.Spec/PSource+PSpecified.xml b/docs/Mono.Android/en/Javax.Crypto.Spec/PSource+PSpecified.xml
index ca9a512865..8a981da6ed 100644
--- a/docs/Mono.Android/en/Javax.Crypto.Spec/PSource+PSpecified.xml
+++ b/docs/Mono.Android/en/Javax.Crypto.Spec/PSource+PSpecified.xml
@@ -59,7 +59,7 @@
             of the array are copied to protect against subsequent
             modification.</param>
         <summary>Constructs the source explicitly with the specified
-            value &lt;code&gt;p&lt;/code&gt; as the encoding input P.</summary>
+            value <c>p</c> as the encoding input P.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Javax.Crypto.Spec/RC2ParameterSpec.xml b/docs/Mono.Android/en/Javax.Crypto.Spec/RC2ParameterSpec.xml
index 69bfe32cdd..1f8c34ae27 100644
--- a/docs/Mono.Android/en/Javax.Crypto.Spec/RC2ParameterSpec.xml
+++ b/docs/Mono.Android/en/Javax.Crypto.Spec/RC2ParameterSpec.xml
@@ -177,9 +177,9 @@
       <Docs>
         <param name="effectiveKeyBits">the effective key size in bits.</param>
         <param name="iv">the buffer with the IV. The first 8 bytes
-            of the buffer beginning at &lt;code&gt;offset&lt;/code&gt; inclusive
+            of the buffer beginning at <c>offset</c> inclusive
             are copied to protect against subsequent modification.</param>
-        <param name="offset">the offset in &lt;code&gt;iv&lt;/code&gt; where the 8-byte IV
+        <param name="offset">the offset in <c>iv</c> where the 8-byte IV
             starts.</param>
         <summary>Constructs a parameter set for RC2 from the given effective key size
             (in bits) and IV.</summary>
diff --git a/docs/Mono.Android/en/Javax.Crypto.Spec/RC5ParameterSpec.xml b/docs/Mono.Android/en/Javax.Crypto.Spec/RC5ParameterSpec.xml
index 0abefff7b3..d53a08cdeb 100644
--- a/docs/Mono.Android/en/Javax.Crypto.Spec/RC5ParameterSpec.xml
+++ b/docs/Mono.Android/en/Javax.Crypto.Spec/RC5ParameterSpec.xml
@@ -140,8 +140,8 @@
         <param name="version">the version.</param>
         <param name="rounds">the number of rounds.</param>
         <param name="wordSize">the word size in bits.</param>
-        <param name="iv">the buffer with the IV. The first &lt;code&gt;2*(wordSize/8)
-            &lt;/code&gt; bytes of the buffer are copied to protect against subsequent
+        <param name="iv">the buffer with the IV. The first <c>2*(wordSize/8)
+            </c> bytes of the buffer are copied to protect against subsequent
             modification.</param>
         <summary>Constructs a parameter set for RC5 from the given version, number of
             rounds, word size (in bits), and IV.</summary>
@@ -190,10 +190,10 @@
         <param name="version">the version.</param>
         <param name="rounds">the number of rounds.</param>
         <param name="wordSize">the word size in bits.</param>
-        <param name="iv">the buffer with the IV. The first &lt;code&gt;2*(wordSize/8)
-            &lt;/code&gt; bytes of the buffer beginning at &lt;code&gt;offset&lt;/code&gt;
+        <param name="iv">the buffer with the IV. The first <c>2*(wordSize/8)
+            </c> bytes of the buffer beginning at <c>offset</c>
             inclusive are copied to protect against subsequent modification.</param>
-        <param name="offset">the offset in &lt;code&gt;iv&lt;/code&gt; where the IV starts.</param>
+        <param name="offset">the offset in <c>iv</c> where the IV starts.</param>
         <summary>Constructs a parameter set for RC5 from the given version, number of
             rounds, word size (in bits), and IV.</summary>
         <remarks>
diff --git a/docs/Mono.Android/en/Javax.Crypto.Spec/SecretKeySpec.xml b/docs/Mono.Android/en/Javax.Crypto.Spec/SecretKeySpec.xml
index 56c8f781d4..87d074b4f6 100644
--- a/docs/Mono.Android/en/Javax.Crypto.Spec/SecretKeySpec.xml
+++ b/docs/Mono.Android/en/Javax.Crypto.Spec/SecretKeySpec.xml
@@ -150,10 +150,10 @@
       </Parameters>
       <Docs>
         <param name="key">the key material of the secret key. The first
-            &lt;code&gt;len&lt;/code&gt; bytes of the array beginning at
-            &lt;code&gt;offset&lt;/code&gt; inclusive are copied to protect
+            <c>len</c> bytes of the array beginning at
+            <c>offset</c> inclusive are copied to protect
             against subsequent modification.</param>
-        <param name="offset">the offset in &lt;code&gt;key&lt;/code&gt; where the key material
+        <param name="offset">the offset in <c>key</c> where the key material
             starts.</param>
         <param name="len">the length of the key material.</param>
         <param name="algorithm">the name of the secret-key algorithm to be associated
@@ -162,8 +162,8 @@
             Java Cryptography Architecture Reference Guide</see>
             for information about standard algorithm names.</param>
         <summary>Constructs a secret key from the given byte array, using the first
-            &lt;code&gt;len&lt;/code&gt; bytes of &lt;code&gt;key&lt;/code&gt;, starting at
-            &lt;code&gt;offset&lt;/code&gt; inclusive.</summary>
+            <c>len</c> bytes of <c>key</c>, starting at
+            <c>offset</c> inclusive.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Javax.Crypto/Cipher.xml b/docs/Mono.Android/en/Javax.Crypto/Cipher.xml
index a23deedc51..e76612f279 100644
--- a/docs/Mono.Android/en/Javax.Crypto/Cipher.xml
+++ b/docs/Mono.Android/en/Javax.Crypto/Cipher.xml
@@ -121,8 +121,8 @@
         <ReturnType>System.String</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Returns the algorithm name of this &lt;code&gt;Cipher&lt;/code&gt; object.</summary>
-        <value>the algorithm name of this &lt;code&gt;Cipher&lt;/code&gt; object.</value>
+        <summary>Returns the algorithm name of this <c>Cipher</c> object.</summary>
+        <value>the algorithm name of this <c>Cipher</c> object.</value>
         <remarks>
           <para>
             <format type="text/html">
@@ -338,7 +338,7 @@
         <param name="output">the output ByteBuffer</param>
         <summary>Encrypts or decrypts data in a single-part operation, or finishes a
             multiple-part operation.</summary>
-        <returns>the number of bytes stored in &lt;code&gt;output&lt;/code&gt;</returns>
+        <returns>the number of bytes stored in <c>output</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -388,11 +388,11 @@
       </Parameters>
       <Docs>
         <param name="output">the buffer for the result</param>
-        <param name="outputOffset">the offset in &lt;code&gt;output&lt;/code&gt; where the result
+        <param name="outputOffset">the offset in <c>output</c> where the result
             is stored</param>
         <summary>Finishes a multiple-part encryption or decryption operation, depending
             on how this cipher was initialized.</summary>
-        <returns>the number of bytes stored in &lt;code&gt;output&lt;/code&gt;</returns>
+        <returns>the number of bytes stored in <c>output</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -441,7 +441,7 @@
       </Parameters>
       <Docs>
         <param name="input">the input buffer</param>
-        <param name="inputOffset">the offset in &lt;code&gt;input&lt;/code&gt; where the input
+        <param name="inputOffset">the offset in <c>input</c> where the input
             starts</param>
         <param name="inputLen">the input length</param>
         <summary>Encrypts or decrypts data in a single-part operation, or finishes a
@@ -497,13 +497,13 @@
       </Parameters>
       <Docs>
         <param name="input">the input buffer</param>
-        <param name="inputOffset">the offset in &lt;code&gt;input&lt;/code&gt; where the input
+        <param name="inputOffset">the offset in <c>input</c> where the input
             starts</param>
         <param name="inputLen">the input length</param>
         <param name="output">the buffer for the result</param>
         <summary>Encrypts or decrypts data in a single-part operation, or finishes a
             multiple-part operation.</summary>
-        <returns>the number of bytes stored in &lt;code&gt;output&lt;/code&gt;</returns>
+        <returns>the number of bytes stored in <c>output</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -556,15 +556,15 @@
       </Parameters>
       <Docs>
         <param name="input">the input buffer</param>
-        <param name="inputOffset">the offset in &lt;code&gt;input&lt;/code&gt; where the input
+        <param name="inputOffset">the offset in <c>input</c> where the input
             starts</param>
         <param name="inputLen">the input length</param>
         <param name="output">the buffer for the result</param>
-        <param name="outputOffset">the offset in &lt;code&gt;output&lt;/code&gt; where the result
+        <param name="outputOffset">the offset in <c>output</c> where the result
             is stored</param>
         <summary>Encrypts or decrypts data in a single-part operation, or finishes a
             multiple-part operation.</summary>
-        <returns>the number of bytes stored in &lt;code&gt;output&lt;/code&gt;</returns>
+        <returns>the number of bytes stored in <c>output</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -696,7 +696,7 @@
             See the Cipher section in the <see href="https://docs.oracle.com/javase/8/docs/technotes/guides/security/StandardNames.html#Cipher">
             Java Cryptography Architecture Standard Algorithm Name Documentation</see>
             for information about standard transformation names.</param>
-        <summary>Returns a &lt;code&gt;Cipher&lt;/code&gt; object that implements the specified
+        <summary>Returns a <c>Cipher</c> object that implements the specified
             transformation.</summary>
         <returns>a cipher that implements the requested transformation.</returns>
         <remarks>
@@ -750,7 +750,7 @@
             Java Cryptography Architecture Standard Algorithm Name Documentation</see>
             for information about standard transformation names.</param>
         <param name="provider">the provider.</param>
-        <summary>Returns a &lt;code&gt;Cipher&lt;/code&gt; object that implements the specified
+        <summary>Returns a <c>Cipher</c> object that implements the specified
             transformation.</summary>
         <returns>a cipher that implements the requested transformation.</returns>
         <remarks>
@@ -805,7 +805,7 @@
             Java Cryptography Architecture Standard Algorithm Name Documentation</see>
             for information about standard transformation names.</param>
         <param name="provider">the name of the provider.</param>
-        <summary>Returns a &lt;code&gt;Cipher&lt;/code&gt; object that implements the specified
+        <summary>Returns a <c>Cipher</c> object that implements the specified
             transformation.</summary>
         <returns>a cipher that implements the requested transformation.</returns>
         <remarks>
@@ -990,9 +990,9 @@
       <Docs>
         <param name="inputLen">the input length (in bytes)</param>
         <summary>Returns the length in bytes that an output buffer would need to be in
-            order to hold the result of the next &lt;code&gt;update&lt;/code&gt; or
-            &lt;code&gt;doFinal&lt;/code&gt; operation, given the input length
-            &lt;code&gt;inputLen&lt;/code&gt; (in bytes).</summary>
+            order to hold the result of the next <c>update</c> or
+            <c>doFinal</c> operation, given the input length
+            <c>inputLen</c> (in bytes).</summary>
         <returns>the required output buffer size (in bytes)</returns>
         <remarks>
           <para>
@@ -1044,8 +1044,8 @@
       <Docs>
         <param name="opmode">the operation mode of this cipher (this is one of the
             following:
-            &lt;code&gt;ENCRYPT_MODE&lt;/code&gt;, &lt;code&gt;DECRYPT_MODE&lt;/code&gt;,
-            &lt;code&gt;WRAP_MODE&lt;/code&gt; or &lt;code&gt;UNWRAP_MODE&lt;/code&gt;)</param>
+            <c>ENCRYPT_MODE</c>, <c>DECRYPT_MODE</c>,
+            <c>WRAP_MODE</c> or <c>UNWRAP_MODE</c>)</param>
         <param name="certificate">the certificate</param>
         <summary>Initializes this cipher with the public key from the given certificate.</summary>
         <remarks>
@@ -1099,8 +1099,8 @@
       <Docs>
         <param name="opmode">the operation mode of this cipher (this is one of
             the following:
-            &lt;code&gt;ENCRYPT_MODE&lt;/code&gt;, &lt;code&gt;DECRYPT_MODE&lt;/code&gt;,
-            &lt;code&gt;WRAP_MODE&lt;/code&gt; or &lt;code&gt;UNWRAP_MODE&lt;/code&gt;)</param>
+            <c>ENCRYPT_MODE</c>, <c>DECRYPT_MODE</c>,
+            <c>WRAP_MODE</c> or <c>UNWRAP_MODE</c>)</param>
         <param name="key">the key</param>
         <summary>Initializes this cipher with a key.</summary>
         <remarks>
@@ -1155,8 +1155,8 @@
       <Docs>
         <param name="opmode">the operation mode of this cipher (this is one of the
             following:
-            &lt;code&gt;ENCRYPT_MODE&lt;/code&gt;, &lt;code&gt;DECRYPT_MODE&lt;/code&gt;,
-            &lt;code&gt;WRAP_MODE&lt;/code&gt; or &lt;code&gt;UNWRAP_MODE&lt;/code&gt;)</param>
+            <c>ENCRYPT_MODE</c>, <c>DECRYPT_MODE</c>,
+            <c>WRAP_MODE</c> or <c>UNWRAP_MODE</c>)</param>
         <param name="certificate">the certificate</param>
         <param name="random">the source of randomness</param>
         <summary>Initializes this cipher with the public key from the given certificate
@@ -1213,9 +1213,9 @@
       </Parameters>
       <Docs>
         <param name="opmode">the operation mode of this cipher (this is one of the
-            following: &lt;code&gt;ENCRYPT_MODE&lt;/code&gt;,
-            &lt;code&gt;DECRYPT_MODE&lt;/code&gt;, &lt;code&gt;WRAP_MODE&lt;/code&gt;
-            or &lt;code&gt;UNWRAP_MODE&lt;/code&gt;)</param>
+            following: <c>ENCRYPT_MODE</c>,
+            <c>DECRYPT_MODE</c>, <c>WRAP_MODE</c>
+            or <c>UNWRAP_MODE</c>)</param>
         <param name="key">the encryption key</param>
         <param name="params">the algorithm parameters</param>
         <summary>Initializes this cipher with a key and a set of algorithm
@@ -1274,8 +1274,8 @@
       <Docs>
         <param name="opmode">the operation mode of this cipher (this is one of the
             following:
-            &lt;code&gt;ENCRYPT_MODE&lt;/code&gt;, &lt;code&gt;DECRYPT_MODE&lt;/code&gt;,
-            &lt;code&gt;WRAP_MODE&lt;/code&gt; or &lt;code&gt;UNWRAP_MODE&lt;/code&gt;)</param>
+            <c>ENCRYPT_MODE</c>, <c>DECRYPT_MODE</c>,
+            <c>WRAP_MODE</c> or <c>UNWRAP_MODE</c>)</param>
         <param name="key">the encryption key</param>
         <param name="random">the source of randomness</param>
         <summary>Initializes this cipher with a key and a source of randomness.</summary>
@@ -1332,8 +1332,8 @@
       <Docs>
         <param name="opmode">the operation mode of this cipher (this is one of the
             following:
-            &lt;code&gt;ENCRYPT_MODE&lt;/code&gt;, &lt;code&gt;DECRYPT_MODE&lt;/code&gt;,
-            &lt;code&gt;WRAP_MODE&lt;/code&gt; or &lt;code&gt;UNWRAP_MODE&lt;/code&gt;)</param>
+            <c>ENCRYPT_MODE</c>, <c>DECRYPT_MODE</c>,
+            <c>WRAP_MODE</c> or <c>UNWRAP_MODE</c>)</param>
         <param name="key">the encryption key</param>
         <param name="params">the algorithm parameters</param>
         <summary>Initializes this cipher with a key and a set of algorithm
@@ -1392,9 +1392,9 @@
       </Parameters>
       <Docs>
         <param name="opmode">the operation mode of this cipher (this is one of the
-            following: &lt;code&gt;ENCRYPT_MODE&lt;/code&gt;,
-            &lt;code&gt;DECRYPT_MODE&lt;/code&gt;, &lt;code&gt;WRAP_MODE&lt;/code&gt;
-            or &lt;code&gt;UNWRAP_MODE&lt;/code&gt;)</param>
+            following: <c>ENCRYPT_MODE</c>,
+            <c>DECRYPT_MODE</c>, <c>WRAP_MODE</c>
+            or <c>UNWRAP_MODE</c>)</param>
         <param name="key">the encryption key</param>
         <param name="params">the algorithm parameters</param>
         <param name="random">the source of randomness</param>
@@ -1456,8 +1456,8 @@
       <Docs>
         <param name="opmode">the operation mode of this cipher (this is one of the
             following:
-            &lt;code&gt;ENCRYPT_MODE&lt;/code&gt;, &lt;code&gt;DECRYPT_MODE&lt;/code&gt;,
-            &lt;code&gt;WRAP_MODE&lt;/code&gt; or &lt;code&gt;UNWRAP_MODE&lt;/code&gt;)</param>
+            <c>ENCRYPT_MODE</c>, <c>DECRYPT_MODE</c>,
+            <c>WRAP_MODE</c> or <c>UNWRAP_MODE</c>)</param>
         <param name="key">the encryption key</param>
         <param name="params">the algorithm parameters</param>
         <param name="random">the source of randomness</param>
@@ -1614,8 +1614,8 @@
         <ReturnType>Java.Security.Provider</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Returns the provider of this &lt;code&gt;Cipher&lt;/code&gt; object.</summary>
-        <value>the provider of this &lt;code&gt;Cipher&lt;/code&gt; object</value>
+        <summary>Returns the provider of this <c>Cipher</c> object.</summary>
+        <value>the provider of this <c>Cipher</c> object</value>
         <remarks>
           <para>
             <format type="text/html">
@@ -1811,8 +1811,8 @@
         <param name="wrappedKeyAlgorithm">the algorithm associated with the wrapped
             key.</param>
         <param name="wrappedKeyType">the type of the wrapped key. This must be one of
-            &lt;code&gt;SECRET_KEY&lt;/code&gt;, &lt;code&gt;PRIVATE_KEY&lt;/code&gt;, or
-            &lt;code&gt;PUBLIC_KEY&lt;/code&gt;.</param>
+            <c>SECRET_KEY</c>, <c>PRIVATE_KEY</c>, or
+            <c>PUBLIC_KEY</c>.</param>
         <summary>Unwrap a previously wrapped key.</summary>
         <returns>the unwrapped key.</returns>
         <remarks>
@@ -1955,7 +1955,7 @@
         <summary>Continues a multiple-part encryption or decryption operation
             (depending on how this cipher was initialized), processing another data
             part.</summary>
-        <returns>the number of bytes stored in &lt;code&gt;output&lt;/code&gt;</returns>
+        <returns>the number of bytes stored in <c>output</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -2003,7 +2003,7 @@
       </Parameters>
       <Docs>
         <param name="input">the input buffer</param>
-        <param name="inputOffset">the offset in &lt;code&gt;input&lt;/code&gt; where the input
+        <param name="inputOffset">the offset in <c>input</c> where the input
             starts</param>
         <param name="inputLen">the input length</param>
         <summary>Continues a multiple-part encryption or decryption operation
@@ -2060,14 +2060,14 @@
       </Parameters>
       <Docs>
         <param name="input">the input buffer</param>
-        <param name="inputOffset">the offset in &lt;code&gt;input&lt;/code&gt; where the input
+        <param name="inputOffset">the offset in <c>input</c> where the input
             starts</param>
         <param name="inputLen">the input length</param>
         <param name="output">the buffer for the result</param>
         <summary>Continues a multiple-part encryption or decryption operation
             (depending on how this cipher was initialized), processing another data
             part.</summary>
-        <returns>the number of bytes stored in &lt;code&gt;output&lt;/code&gt;</returns>
+        <returns>the number of bytes stored in <c>output</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -2118,16 +2118,16 @@
       </Parameters>
       <Docs>
         <param name="input">the input buffer</param>
-        <param name="inputOffset">the offset in &lt;code&gt;input&lt;/code&gt; where the input
+        <param name="inputOffset">the offset in <c>input</c> where the input
             starts</param>
         <param name="inputLen">the input length</param>
         <param name="output">the buffer for the result</param>
-        <param name="outputOffset">the offset in &lt;code&gt;output&lt;/code&gt; where the result
+        <param name="outputOffset">the offset in <c>output</c> where the result
             is stored</param>
         <summary>Continues a multiple-part encryption or decryption operation
             (depending on how this cipher was initialized), processing another data
             part.</summary>
-        <returns>the number of bytes stored in &lt;code&gt;output&lt;/code&gt;</returns>
+        <returns>the number of bytes stored in <c>output</c></returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Javax.Crypto/CipherSpi.xml b/docs/Mono.Android/en/Javax.Crypto/CipherSpi.xml
index 31925b9fea..cf28de5d45 100644
--- a/docs/Mono.Android/en/Javax.Crypto/CipherSpi.xml
+++ b/docs/Mono.Android/en/Javax.Crypto/CipherSpi.xml
@@ -19,7 +19,7 @@
   </Attributes>
   <Docs since="1">
     <summary>This class defines the <i>Service Provider Interface</i> (&lt;b&gt;SPI&lt;/b&gt;)
-            for the &lt;code&gt;Cipher&lt;/code&gt; class.</summary>
+            for the <c>Cipher</c> class.</summary>
     <remarks>
       <para>
         <format type="text/html">
@@ -110,7 +110,7 @@
         <param name="output">the output ByteByffer</param>
         <summary>Encrypts or decrypts data in a single-part operation,
             or finishes a multiple-part operation.</summary>
-        <returns>the number of bytes stored in &lt;code&gt;output&lt;/code&gt;</returns>
+        <returns>the number of bytes stored in <c>output</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -161,7 +161,7 @@
       </Parameters>
       <Docs>
         <param name="input">the input buffer</param>
-        <param name="inputOffset">the offset in &lt;code&gt;input&lt;/code&gt; where the input
+        <param name="inputOffset">the offset in <c>input</c> where the input
             starts</param>
         <param name="inputLen">the input length</param>
         <summary>Encrypts or decrypts data in a single-part operation,
@@ -214,15 +214,15 @@
       </Parameters>
       <Docs>
         <param name="input">the input buffer</param>
-        <param name="inputOffset">the offset in &lt;code&gt;input&lt;/code&gt; where the input
+        <param name="inputOffset">the offset in <c>input</c> where the input
             starts</param>
         <param name="inputLen">the input length</param>
         <param name="output">the buffer for the result</param>
-        <param name="outputOffset">the offset in &lt;code&gt;output&lt;/code&gt; where the result
+        <param name="outputOffset">the offset in <c>output</c> where the result
             is stored</param>
         <summary>Encrypts or decrypts data in a single-part operation,
             or finishes a multiple-part operation.</summary>
-        <returns>the number of bytes stored in &lt;code&gt;output&lt;/code&gt;</returns>
+        <returns>the number of bytes stored in <c>output</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -391,9 +391,9 @@
       <Docs>
         <param name="inputLen">the input length (in bytes)</param>
         <summary>Returns the length in bytes that an output buffer would
-            need to be in order to hold the result of the next &lt;code&gt;update&lt;/code&gt;
-            or &lt;code&gt;doFinal&lt;/code&gt; operation, given the input length
-            &lt;code&gt;inputLen&lt;/code&gt; (in bytes).</summary>
+            need to be in order to hold the result of the next <c>update</c>
+            or <c>doFinal</c> operation, given the input length
+            <c>inputLen</c> (in bytes).</summary>
         <returns>the required output buffer size (in bytes)</returns>
         <remarks>
           <para>
@@ -476,8 +476,8 @@
       <Docs>
         <param name="opmode">the operation mode of this cipher (this is one of
             the following:
-            &lt;code&gt;ENCRYPT_MODE&lt;/code&gt;, &lt;code&gt;DECRYPT_MODE&lt;/code&gt;,
-            &lt;code&gt;WRAP_MODE&lt;/code&gt; or &lt;code&gt;UNWRAP_MODE&lt;/code&gt;)</param>
+            <c>ENCRYPT_MODE</c>, <c>DECRYPT_MODE</c>,
+            <c>WRAP_MODE</c> or <c>UNWRAP_MODE</c>)</param>
         <param name="key">the encryption key</param>
         <param name="random">the source of randomness</param>
         <summary>Initializes this cipher with a key and a source
@@ -528,8 +528,8 @@
       <Docs>
         <param name="opmode">the operation mode of this cipher (this is one of
             the following:
-            &lt;code&gt;ENCRYPT_MODE&lt;/code&gt;, &lt;code&gt;DECRYPT_MODE&lt;/code&gt;,
-            &lt;code&gt;WRAP_MODE&lt;/code&gt; or &lt;code&gt;UNWRAP_MODE&lt;/code&gt;)</param>
+            <c>ENCRYPT_MODE</c>, <c>DECRYPT_MODE</c>,
+            <c>WRAP_MODE</c> or <c>UNWRAP_MODE</c>)</param>
         <param name="key">the encryption key</param>
         <param name="params">the algorithm parameters</param>
         <param name="random">the source of randomness</param>
@@ -583,8 +583,8 @@
       <Docs>
         <param name="opmode">the operation mode of this cipher (this is one of
             the following:
-            &lt;code&gt;ENCRYPT_MODE&lt;/code&gt;, &lt;code&gt;DECRYPT_MODE&lt;/code&gt;,
-            &lt;code&gt;WRAP_MODE&lt;/code&gt; or &lt;code&gt;UNWRAP_MODE&lt;/code&gt;)</param>
+            <c>ENCRYPT_MODE</c>, <c>DECRYPT_MODE</c>,
+            <c>WRAP_MODE</c> or <c>UNWRAP_MODE</c>)</param>
         <param name="key">the encryption key</param>
         <param name="params">the algorithm parameters</param>
         <param name="random">the source of randomness</param>
@@ -725,8 +725,8 @@
         <param name="wrappedKeyAlgorithm">the algorithm associated with the wrapped
             key.</param>
         <param name="wrappedKeyType">the type of the wrapped key. This is one of
-            &lt;code&gt;SECRET_KEY&lt;/code&gt;, &lt;code&gt;PRIVATE_KEY&lt;/code&gt;, or
-            &lt;code&gt;PUBLIC_KEY&lt;/code&gt;.</param>
+            <c>SECRET_KEY</c>, <c>PRIVATE_KEY</c>, or
+            <c>PUBLIC_KEY</c>.</param>
         <summary>Unwrap a previously wrapped key.</summary>
         <returns>the unwrapped key.</returns>
         <remarks>
@@ -778,7 +778,7 @@
         <summary>Continues a multiple-part encryption or decryption operation
             (depending on how this cipher was initialized), processing another data
             part.</summary>
-        <returns>the number of bytes stored in &lt;code&gt;output&lt;/code&gt;</returns>
+        <returns>the number of bytes stored in <c>output</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -822,7 +822,7 @@
       </Parameters>
       <Docs>
         <param name="input">the input buffer</param>
-        <param name="inputOffset">the offset in &lt;code&gt;input&lt;/code&gt; where the input
+        <param name="inputOffset">the offset in <c>input</c> where the input
             starts</param>
         <param name="inputLen">the input length</param>
         <summary>Continues a multiple-part encryption or decryption operation
@@ -878,16 +878,16 @@
       </Parameters>
       <Docs>
         <param name="input">the input buffer</param>
-        <param name="inputOffset">the offset in &lt;code&gt;input&lt;/code&gt; where the input
+        <param name="inputOffset">the offset in <c>input</c> where the input
             starts</param>
         <param name="inputLen">the input length</param>
         <param name="output">the buffer for the result</param>
-        <param name="outputOffset">the offset in &lt;code&gt;output&lt;/code&gt; where the result
+        <param name="outputOffset">the offset in <c>output</c> where the result
             is stored</param>
         <summary>Continues a multiple-part encryption or decryption operation
             (depending on how this cipher was initialized), processing another data
             part.</summary>
-        <returns>the number of bytes stored in &lt;code&gt;output&lt;/code&gt;</returns>
+        <returns>the number of bytes stored in <c>output</c></returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Javax.Crypto/EncryptedPrivateKeyInfo.xml b/docs/Mono.Android/en/Javax.Crypto/EncryptedPrivateKeyInfo.xml
index df5d4ee969..58af9bd3a4 100644
--- a/docs/Mono.Android/en/Javax.Crypto/EncryptedPrivateKeyInfo.xml
+++ b/docs/Mono.Android/en/Javax.Crypto/EncryptedPrivateKeyInfo.xml
@@ -18,7 +18,7 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>This class implements the &lt;code&gt;EncryptedPrivateKeyInfo&lt;/code&gt; type
+    <summary>This class implements the <c>EncryptedPrivateKeyInfo</c> type
             as defined in PKCS #8.</summary>
     <remarks>
       <para>
@@ -98,14 +98,14 @@
       </Parameters>
       <Docs>
         <param name="algParams">the algorithm parameters for the encryption
-            algorithm. &lt;code&gt;algParams.getEncoded()&lt;/code&gt; should return
-            the ASN.1 encoded bytes of the &lt;code&gt;parameters&lt;/code&gt; field
-            of the &lt;code&gt;AlgorithmIdentifer&lt;/code&gt; component of the
-            &lt;code&gt;EncryptedPrivateKeyInfo&lt;/code&gt; type.</param>
+            algorithm. <c>algParams.getEncoded()</c> should return
+            the ASN.1 encoded bytes of the <c>parameters</c> field
+            of the <c>AlgorithmIdentifer</c> component of the
+            <c>EncryptedPrivateKeyInfo</c> type.</param>
         <param name="encryptedData">encrypted data. The contents of
-            &lt;code&gt;encrypedData&lt;/code&gt; are copied to protect against
+            <c>encrypedData</c> are copied to protect against
             subsequent modification when constructing this object.</param>
-        <summary>Constructs an &lt;code&gt;EncryptedPrivateKeyInfo&lt;/code&gt; from the
+        <summary>Constructs an <c>EncryptedPrivateKeyInfo</c> from the
             encryption algorithm parameters and the encrypted data.</summary>
         <remarks>
           <para>
@@ -176,9 +176,9 @@
             Java Cryptography Architecture Reference Guide</see>
             for information about standard Cipher algorithm names.</param>
         <param name="encryptedData">encrypted data. The contents of
-            &lt;code&gt;encrypedData&lt;/code&gt; are copied to protect against subsequent
+            <c>encrypedData</c> are copied to protect against subsequent
             modification when constructing this object.</param>
-        <summary>Constructs an &lt;code&gt;EncryptedPrivateKeyInfo&lt;/code&gt; from the
+        <summary>Constructs an <c>EncryptedPrivateKeyInfo</c> from the
             encryption algorithm name and the encrypted data.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Crypto/ExemptionMechanism.xml b/docs/Mono.Android/en/Javax.Crypto/ExemptionMechanism.xml
index ac96953981..a0088318af 100644
--- a/docs/Mono.Android/en/Javax.Crypto/ExemptionMechanism.xml
+++ b/docs/Mono.Android/en/Javax.Crypto/ExemptionMechanism.xml
@@ -167,8 +167,8 @@
       <Docs>
         <param name="output">the buffer for the result</param>
         <summary>Generates the exemption mechanism key blob, and stores the result in
-            the &lt;code&gt;output&lt;/code&gt; buffer.</summary>
-        <returns>the number of bytes stored in &lt;code&gt;output&lt;/code&gt;</returns>
+            the <c>output</c> buffer.</summary>
+        <returns>the number of bytes stored in <c>output</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -214,12 +214,12 @@
       </Parameters>
       <Docs>
         <param name="output">the buffer for the result</param>
-        <param name="outputOffset">the offset in &lt;code&gt;output&lt;/code&gt; where the result
+        <param name="outputOffset">the offset in <c>output</c> where the result
             is stored</param>
         <summary>Generates the exemption mechanism key blob, and stores the result in
-            the &lt;code&gt;output&lt;/code&gt; buffer, starting at &lt;code&gt;outputOffset&lt;/code&gt;
+            the <c>output</c> buffer, starting at <c>outputOffset</c>
             inclusive.</summary>
-        <returns>the number of bytes stored in &lt;code&gt;output&lt;/code&gt;</returns>
+        <returns>the number of bytes stored in <c>output</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -269,9 +269,9 @@
             <see href="https://docs.oracle.com/javase/8/docs/technotes/guides/security/StandardNames.html#Exemption">
             Java Cryptography Architecture Standard Algorithm Name Documentation</see>
             for information about standard exemption mechanism names.</param>
-        <summary>Returns an &lt;code&gt;ExemptionMechanism&lt;/code&gt; object that implements the
+        <summary>Returns an <c>ExemptionMechanism</c> object that implements the
             specified exemption mechanism algorithm.</summary>
-        <returns>the new &lt;code&gt;ExemptionMechanism&lt;/code&gt; object.</returns>
+        <returns>the new <c>ExemptionMechanism</c> object.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -320,9 +320,9 @@
             Java Cryptography Architecture Standard Algorithm Name Documentation</see>
             for information about standard exemption mechanism names.</param>
         <param name="provider">the provider.</param>
-        <summary>Returns an &lt;code&gt;ExemptionMechanism&lt;/code&gt; object that implements the
+        <summary>Returns an <c>ExemptionMechanism</c> object that implements the
             specified exemption mechanism algorithm.</summary>
-        <returns>the new &lt;code&gt;ExemptionMechanism&lt;/code&gt; object.</returns>
+        <returns>the new <c>ExemptionMechanism</c> object.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -373,9 +373,9 @@
             Java Cryptography Architecture Standard Algorithm Name Documentation</see>
             for information about standard exemption mechanism names.</param>
         <param name="provider">the name of the provider.</param>
-        <summary>Returns an &lt;code&gt;ExemptionMechanism&lt;/code&gt; object that implements the
+        <summary>Returns an <c>ExemptionMechanism</c> object that implements the
             specified exemption mechanism algorithm.</summary>
-        <returns>the new &lt;code&gt;ExemptionMechanism&lt;/code&gt; object.</returns>
+        <returns>the new <c>ExemptionMechanism</c> object.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -424,7 +424,7 @@
         <summary>Returns the length in bytes that an output buffer would need to be in
             order to hold the result of the next
             <c>#genExemptionBlob(byte[]) genExemptionBlob</c>
-            operation, given the input length &lt;code&gt;inputLen&lt;/code&gt; (in bytes).</summary>
+            operation, given the input length <c>inputLen</c> (in bytes).</summary>
         <returns>the required output buffer size (in bytes)</returns>
         <remarks>
           <para>
@@ -610,7 +610,7 @@
         <summary>Returns whether the result blob has been generated successfully by this
             exemption mechanism.</summary>
         <returns>whether the result blob of the same key has been generated
-            successfully by this exemption mechanism; false if &lt;code&gt;key&lt;/code&gt;
+            successfully by this exemption mechanism; false if <c>key</c>
             is null.</returns>
         <remarks>
           <para>
@@ -682,9 +682,9 @@
       </ReturnValue>
       <Docs>
         <summary>Returns the exemption mechanism name of this
-            &lt;code&gt;ExemptionMechanism&lt;/code&gt; object.</summary>
+            <c>ExemptionMechanism</c> object.</summary>
         <value>the exemption mechanism name of this
-            &lt;code&gt;ExemptionMechanism&lt;/code&gt; object.</value>
+            <c>ExemptionMechanism</c> object.</value>
         <remarks>
           <para>
             <format type="text/html">
@@ -720,8 +720,8 @@
         <ReturnType>Java.Security.Provider</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Returns the provider of this &lt;code&gt;ExemptionMechanism&lt;/code&gt; object.</summary>
-        <value>the provider of this &lt;code&gt;ExemptionMechanism&lt;/code&gt; object.</value>
+        <summary>Returns the provider of this <c>ExemptionMechanism</c> object.</summary>
+        <value>the provider of this <c>ExemptionMechanism</c> object.</value>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Javax.Crypto/ExemptionMechanismSpi.xml b/docs/Mono.Android/en/Javax.Crypto/ExemptionMechanismSpi.xml
index f0c95e951e..1256a0e968 100644
--- a/docs/Mono.Android/en/Javax.Crypto/ExemptionMechanismSpi.xml
+++ b/docs/Mono.Android/en/Javax.Crypto/ExemptionMechanismSpi.xml
@@ -19,7 +19,7 @@
   </Attributes>
   <Docs since="1">
     <summary>This class defines the <i>Service Provider Interface</i> (&lt;b&gt;SPI&lt;/b&gt;)
-            for the &lt;code&gt;ExemptionMechanism&lt;/code&gt; class.</summary>
+            for the <c>ExemptionMechanism</c> class.</summary>
     <remarks>
       <para>
         <format type="text/html">
@@ -147,12 +147,12 @@
       </Parameters>
       <Docs>
         <param name="output">the buffer for the result</param>
-        <param name="outputOffset">the offset in &lt;code&gt;output&lt;/code&gt; where the result
+        <param name="outputOffset">the offset in <c>output</c> where the result
             is stored</param>
         <summary>Generates the exemption mechanism key blob, and stores the result in
-            the &lt;code&gt;output&lt;/code&gt; buffer, starting at &lt;code&gt;outputOffset&lt;/code&gt;
+            the <c>output</c> buffer, starting at <c>outputOffset</c>
             inclusive.</summary>
-        <returns>the number of bytes stored in &lt;code&gt;output&lt;/code&gt;</returns>
+        <returns>the number of bytes stored in <c>output</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -198,7 +198,7 @@
         <summary>Returns the length in bytes that an output buffer would need to be in
             order to hold the result of the next
             <c>#engineGenExemptionBlob(byte[], int) engineGenExemptionBlob</c>
-            operation, given the input length &lt;code&gt;inputLen&lt;/code&gt; (in bytes).</summary>
+            operation, given the input length <c>inputLen</c> (in bytes).</summary>
         <returns>the required output buffer size (in bytes)</returns>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Crypto/KeyAgreement.xml b/docs/Mono.Android/en/Javax.Crypto/KeyAgreement.xml
index 19d23f33b8..c9d51c6673 100644
--- a/docs/Mono.Android/en/Javax.Crypto/KeyAgreement.xml
+++ b/docs/Mono.Android/en/Javax.Crypto/KeyAgreement.xml
@@ -119,8 +119,8 @@
         <ReturnType>System.String</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Returns the algorithm name of this &lt;code&gt;KeyAgreement&lt;/code&gt; object.</summary>
-        <value>the algorithm name of this &lt;code&gt;KeyAgreement&lt;/code&gt; object.</value>
+        <summary>Returns the algorithm name of this <c>KeyAgreement</c> object.</summary>
+        <value>the algorithm name of this <c>KeyAgreement</c> object.</value>
         <remarks>
           <para>
             <format type="text/html">
@@ -253,7 +253,7 @@
       </Parameters>
       <Docs>
         <param name="algorithm">the requested secret-key algorithm</param>
-        <summary>Creates the shared secret and returns it as a &lt;code&gt;SecretKey&lt;/code&gt;
+        <summary>Creates the shared secret and returns it as a <c>SecretKey</c>
             object of the specified algorithm.</summary>
         <returns>the shared secret key</returns>
         <remarks>
@@ -302,11 +302,11 @@
       </Parameters>
       <Docs>
         <param name="sharedSecret">the buffer for the shared secret</param>
-        <param name="offset">the offset in &lt;code&gt;sharedSecret&lt;/code&gt; where the
+        <param name="offset">the offset in <c>sharedSecret</c> where the
             shared secret will be stored</param>
         <summary>Generates the shared secret, and places it into the buffer
-            &lt;code&gt;sharedSecret&lt;/code&gt;, beginning at &lt;code&gt;offset&lt;/code&gt; inclusive.</summary>
-        <returns>the number of bytes placed into &lt;code&gt;sharedSecret&lt;/code&gt;</returns>
+            <c>sharedSecret</c>, beginning at <c>offset</c> inclusive.</summary>
+        <returns>the number of bytes placed into <c>sharedSecret</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -353,9 +353,9 @@
             See the KeyAgreement section in the <see href="https://docs.oracle.com/javase/8/docs/technotes/guides/security/StandardNames.html#KeyAgreement">
             Java Cryptography Architecture Standard Algorithm Name Documentation</see>
             for information about standard algorithm names.</param>
-        <summary>Returns a &lt;code&gt;KeyAgreement&lt;/code&gt; object that implements the
+        <summary>Returns a <c>KeyAgreement</c> object that implements the
             specified key agreement algorithm.</summary>
-        <returns>the new &lt;code&gt;KeyAgreement&lt;/code&gt; object.</returns>
+        <returns>the new <c>KeyAgreement</c> object.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -404,9 +404,9 @@
             Java Cryptography Architecture Standard Algorithm Name Documentation</see>
             for information about standard algorithm names.</param>
         <param name="provider">the provider.</param>
-        <summary>Returns a &lt;code&gt;KeyAgreement&lt;/code&gt; object that implements the
+        <summary>Returns a <c>KeyAgreement</c> object that implements the
             specified key agreement algorithm.</summary>
-        <returns>the new &lt;code&gt;KeyAgreement&lt;/code&gt; object.</returns>
+        <returns>the new <c>KeyAgreement</c> object.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -457,9 +457,9 @@
             Java Cryptography Architecture Standard Algorithm Name Documentation</see>
             for information about standard algorithm names.</param>
         <param name="provider">the name of the provider.</param>
-        <summary>Returns a &lt;code&gt;KeyAgreement&lt;/code&gt; object that implements the
+        <summary>Returns a <c>KeyAgreement</c> object that implements the
             specified key agreement algorithm.</summary>
-        <returns>the new &lt;code&gt;KeyAgreement&lt;/code&gt; object.</returns>
+        <returns>the new <c>KeyAgreement</c> object.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -727,8 +727,8 @@
         <ReturnType>Java.Security.Provider</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Returns the provider of this &lt;code&gt;KeyAgreement&lt;/code&gt; object.</summary>
-        <value>the provider of this &lt;code&gt;KeyAgreement&lt;/code&gt; object</value>
+        <summary>Returns the provider of this <c>KeyAgreement</c> object.</summary>
+        <value>the provider of this <c>KeyAgreement</c> object</value>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Javax.Crypto/KeyAgreementSpi.xml b/docs/Mono.Android/en/Javax.Crypto/KeyAgreementSpi.xml
index 68279b67d9..113044e6d8 100644
--- a/docs/Mono.Android/en/Javax.Crypto/KeyAgreementSpi.xml
+++ b/docs/Mono.Android/en/Javax.Crypto/KeyAgreementSpi.xml
@@ -19,7 +19,7 @@
   </Attributes>
   <Docs since="1">
     <summary>This class defines the <i>Service Provider Interface</i> (&lt;b&gt;SPI&lt;/b&gt;)
-            for the &lt;code&gt;KeyAgreement&lt;/code&gt; class.</summary>
+            for the <c>KeyAgreement</c> class.</summary>
     <remarks>
       <para>
         <format type="text/html">
@@ -248,11 +248,11 @@
       </Parameters>
       <Docs>
         <param name="sharedSecret">the buffer for the shared secret</param>
-        <param name="offset">the offset in &lt;code&gt;sharedSecret&lt;/code&gt; where the
+        <param name="offset">the offset in <c>sharedSecret</c> where the
             shared secret will be stored</param>
         <summary>Generates the shared secret, and places it into the buffer
-            &lt;code&gt;sharedSecret&lt;/code&gt;, beginning at &lt;code&gt;offset&lt;/code&gt; inclusive.</summary>
-        <returns>the number of bytes placed into &lt;code&gt;sharedSecret&lt;/code&gt;</returns>
+            <c>sharedSecret</c>, beginning at <c>offset</c> inclusive.</summary>
+        <returns>the number of bytes placed into <c>sharedSecret</c></returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Javax.Crypto/KeyGenerator.xml b/docs/Mono.Android/en/Javax.Crypto/KeyGenerator.xml
index 6d2f2edbb3..1d9f39a791 100644
--- a/docs/Mono.Android/en/Javax.Crypto/KeyGenerator.xml
+++ b/docs/Mono.Android/en/Javax.Crypto/KeyGenerator.xml
@@ -118,8 +118,8 @@
         <ReturnType>System.String</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Returns the algorithm name of this &lt;code&gt;KeyGenerator&lt;/code&gt; object.</summary>
-        <value>the algorithm name of this &lt;code&gt;KeyGenerator&lt;/code&gt; object.</value>
+        <summary>Returns the algorithm name of this <c>KeyGenerator</c> object.</summary>
+        <value>the algorithm name of this <c>KeyGenerator</c> object.</value>
         <remarks>
           <para>
             <format type="text/html">
@@ -200,9 +200,9 @@
             See the KeyGenerator section in the <see href="https://docs.oracle.com/javase/8/docs/technotes/guides/security/StandardNames.html#KeyGenerator">
             Java Cryptography Architecture Standard Algorithm Name Documentation</see>
             for information about standard algorithm names.</param>
-        <summary>Returns a &lt;code&gt;KeyGenerator&lt;/code&gt; object that generates secret keys
+        <summary>Returns a <c>KeyGenerator</c> object that generates secret keys
             for the specified algorithm.</summary>
-        <returns>the new &lt;code&gt;KeyGenerator&lt;/code&gt; object.</returns>
+        <returns>the new <c>KeyGenerator</c> object.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -250,9 +250,9 @@
             Java Cryptography Architecture Standard Algorithm Name Documentation</see>
             for information about standard algorithm names.</param>
         <param name="provider">the provider.</param>
-        <summary>Returns a &lt;code&gt;KeyGenerator&lt;/code&gt; object that generates secret keys
+        <summary>Returns a <c>KeyGenerator</c> object that generates secret keys
             for the specified algorithm.</summary>
-        <returns>the new &lt;code&gt;KeyGenerator&lt;/code&gt; object.</returns>
+        <returns>the new <c>KeyGenerator</c> object.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -302,9 +302,9 @@
             Java Cryptography Architecture Standard Algorithm Name Documentation</see>
             for information about standard algorithm names.</param>
         <param name="provider">the name of the provider.</param>
-        <summary>Returns a &lt;code&gt;KeyGenerator&lt;/code&gt; object that generates secret keys
+        <summary>Returns a <c>KeyGenerator</c> object that generates secret keys
             for the specified algorithm.</summary>
-        <returns>the new &lt;code&gt;KeyGenerator&lt;/code&gt; object.</returns>
+        <returns>the new <c>KeyGenerator</c> object.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -591,8 +591,8 @@
         <ReturnType>Java.Security.Provider</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Returns the provider of this &lt;code&gt;KeyGenerator&lt;/code&gt; object.</summary>
-        <value>the provider of this &lt;code&gt;KeyGenerator&lt;/code&gt; object</value>
+        <summary>Returns the provider of this <c>KeyGenerator</c> object.</summary>
+        <value>the provider of this <c>KeyGenerator</c> object</value>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Javax.Crypto/KeyGeneratorSpi.xml b/docs/Mono.Android/en/Javax.Crypto/KeyGeneratorSpi.xml
index c14f2d0678..d664308112 100644
--- a/docs/Mono.Android/en/Javax.Crypto/KeyGeneratorSpi.xml
+++ b/docs/Mono.Android/en/Javax.Crypto/KeyGeneratorSpi.xml
@@ -19,7 +19,7 @@
   </Attributes>
   <Docs since="1">
     <summary>This class defines the <i>Service Provider Interface</i> (&lt;b&gt;SPI&lt;/b&gt;)
-            for the &lt;code&gt;KeyGenerator&lt;/code&gt; class.</summary>
+            for the <c>KeyGenerator</c> class.</summary>
     <remarks>
       <para>
         <format type="text/html">
diff --git a/docs/Mono.Android/en/Javax.Crypto/Mac.xml b/docs/Mono.Android/en/Javax.Crypto/Mac.xml
index 83edf9a26f..c424cc5b99 100644
--- a/docs/Mono.Android/en/Javax.Crypto/Mac.xml
+++ b/docs/Mono.Android/en/Javax.Crypto/Mac.xml
@@ -132,8 +132,8 @@
         <ReturnType>System.String</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Returns the algorithm name of this &lt;code&gt;Mac&lt;/code&gt; object.</summary>
-        <value>the algorithm name of this &lt;code&gt;Mac&lt;/code&gt; object.</value>
+        <summary>Returns the algorithm name of this <c>Mac</c> object.</summary>
+        <value>the algorithm name of this <c>Mac</c> object.</value>
         <remarks>
           <para>
             <format type="text/html">
@@ -297,7 +297,7 @@
       </Parameters>
       <Docs>
         <param name="output">the buffer where the MAC result is stored</param>
-        <param name="outOffset">the offset in &lt;code&gt;output&lt;/code&gt; where the MAC is
+        <param name="outOffset">the offset in <c>output</c> where the MAC is
             stored</param>
         <summary>Finishes the MAC operation.</summary>
         <returns>the MAC result.</returns>
@@ -348,9 +348,9 @@
             See the Mac section in the <see href="https://docs.oracle.com/javase/8/docs/technotes/guides/security/StandardNames.html#Mac">
             Java Cryptography Architecture Standard Algorithm Name Documentation</see>
             for information about standard algorithm names.</param>
-        <summary>Returns a &lt;code&gt;Mac&lt;/code&gt; object that implements the
+        <summary>Returns a <c>Mac</c> object that implements the
             specified MAC algorithm.</summary>
-        <returns>the new &lt;code&gt;Mac&lt;/code&gt; object.</returns>
+        <returns>the new <c>Mac</c> object.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -399,9 +399,9 @@
             Java Cryptography Architecture Standard Algorithm Name Documentation</see>
             for information about standard algorithm names.</param>
         <param name="provider">the provider.</param>
-        <summary>Returns a &lt;code&gt;Mac&lt;/code&gt; object that implements the
+        <summary>Returns a <c>Mac</c> object that implements the
             specified MAC algorithm.</summary>
-        <returns>the new &lt;code&gt;Mac&lt;/code&gt; object.</returns>
+        <returns>the new <c>Mac</c> object.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -452,9 +452,9 @@
             Java Cryptography Architecture Standard Algorithm Name Documentation</see>
             for information about standard algorithm names.</param>
         <param name="provider">the name of the provider.</param>
-        <summary>Returns a &lt;code&gt;Mac&lt;/code&gt; object that implements the
+        <summary>Returns a <c>Mac</c> object that implements the
             specified MAC algorithm.</summary>
-        <returns>the new &lt;code&gt;Mac&lt;/code&gt; object.</returns>
+        <returns>the new <c>Mac</c> object.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -501,7 +501,7 @@
       </Parameters>
       <Docs>
         <param name="key">the key.</param>
-        <summary>Initializes this &lt;code&gt;Mac&lt;/code&gt; object with the given key.</summary>
+        <summary>Initializes this <c>Mac</c> object with the given key.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -547,7 +547,7 @@
       <Docs>
         <param name="key">the key.</param>
         <param name="params">the algorithm parameters.</param>
-        <summary>Initializes this &lt;code&gt;Mac&lt;/code&gt; object with the given key and
+        <summary>Initializes this <c>Mac</c> object with the given key and
             algorithm parameters.</summary>
         <remarks>
           <para>
@@ -660,8 +660,8 @@
         <ReturnType>Java.Security.Provider</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Returns the provider of this &lt;code&gt;Mac&lt;/code&gt; object.</summary>
-        <value>the provider of this &lt;code&gt;Mac&lt;/code&gt; object.</value>
+        <summary>Returns the provider of this <c>Mac</c> object.</summary>
+        <value>the provider of this <c>Mac</c> object.</value>
         <remarks>
           <para>
             <format type="text/html">
@@ -698,7 +698,7 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Resets this &lt;code&gt;Mac&lt;/code&gt; object.</summary>
+        <summary>Resets this <c>Mac</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -800,7 +800,8 @@
       </Parameters>
       <Docs>
         <param name="input">the ByteBuffer</param>
-        <summary>Processes &lt;code&gt;input.</summary>
+        <summary>Processes <c>input.remaining()</c> bytes in the ByteBuffer
+            <c>input</c>, starting at <c>input.position()</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -928,10 +929,10 @@
       </Parameters>
       <Docs>
         <param name="input">the input buffer.</param>
-        <param name="offset">the offset in &lt;code&gt;input&lt;/code&gt; where the input starts.</param>
+        <param name="offset">the offset in <c>input</c> where the input starts.</param>
         <param name="len">the number of bytes to process.</param>
-        <summary>Processes the first &lt;code&gt;len&lt;/code&gt; bytes in &lt;code&gt;input&lt;/code&gt;,
-            starting at &lt;code&gt;offset&lt;/code&gt; inclusive.</summary>
+        <summary>Processes the first <c>len</c> bytes in <c>input</c>,
+            starting at <c>offset</c> inclusive.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Javax.Crypto/MacSpi.xml b/docs/Mono.Android/en/Javax.Crypto/MacSpi.xml
index 2cf7e38416..0ef227ea13 100644
--- a/docs/Mono.Android/en/Javax.Crypto/MacSpi.xml
+++ b/docs/Mono.Android/en/Javax.Crypto/MacSpi.xml
@@ -19,7 +19,7 @@
   </Attributes>
   <Docs since="1">
     <summary>This class defines the <i>Service Provider Interface</i> (&lt;b&gt;SPI&lt;/b&gt;)
-            for the &lt;code&gt;Mac&lt;/code&gt; class.</summary>
+            for the <c>Mac</c> class.</summary>
     <remarks>
       <para>
         <format type="text/html">
@@ -309,7 +309,8 @@
       </Parameters>
       <Docs>
         <param name="input">the ByteBuffer</param>
-        <summary>Processes &lt;code&gt;input.</summary>
+        <summary>Processes <c>input.remaining()</c> bytes in the ByteBuffer
+            <c>input</c>, starting at <c>input.position()</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -391,10 +392,10 @@
       </Parameters>
       <Docs>
         <param name="input">the input buffer.</param>
-        <param name="offset">the offset in &lt;code&gt;input&lt;/code&gt; where the input starts.</param>
+        <param name="offset">the offset in <c>input</c> where the input starts.</param>
         <param name="len">the number of bytes to process.</param>
-        <summary>Processes the first &lt;code&gt;len&lt;/code&gt; bytes in &lt;code&gt;input&lt;/code&gt;,
-            starting at &lt;code&gt;offset&lt;/code&gt; inclusive.</summary>
+        <summary>Processes the first <c>len</c> bytes in <c>input</c>,
+            starting at <c>offset</c> inclusive.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Javax.Crypto/SecretKeyFactory.xml b/docs/Mono.Android/en/Javax.Crypto/SecretKeyFactory.xml
index e62a5bc1c3..bce86b76ea 100644
--- a/docs/Mono.Android/en/Javax.Crypto/SecretKeyFactory.xml
+++ b/docs/Mono.Android/en/Javax.Crypto/SecretKeyFactory.xml
@@ -118,8 +118,8 @@
         <ReturnType>System.String</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Returns the algorithm name of this &lt;code&gt;SecretKeyFactory&lt;/code&gt; object.</summary>
-        <value>the algorithm name of this &lt;code&gt;SecretKeyFactory&lt;/code&gt;
+        <summary>Returns the algorithm name of this <c>SecretKeyFactory</c> object.</summary>
+        <value>the algorithm name of this <c>SecretKeyFactory</c>
             object.</value>
         <remarks>
           <para>
@@ -160,7 +160,7 @@
       </Parameters>
       <Docs>
         <param name="keySpec">the specification (key material) of the secret key</param>
-        <summary>Generates a &lt;code&gt;SecretKey&lt;/code&gt; object from the provided key
+        <summary>Generates a <c>SecretKey</c> object from the provided key
             specification (key material).</summary>
         <returns>the secret key</returns>
         <remarks>
@@ -209,9 +209,9 @@
             See the SecretKeyFactory section in the <see href="https://docs.oracle.com/javase/8/docs/technotes/guides/security/StandardNames.html#SecretKeyFactory">
             Java Cryptography Architecture Standard Algorithm Name Documentation</see>
             for information about standard algorithm names.</param>
-        <summary>Returns a &lt;code&gt;SecretKeyFactory&lt;/code&gt; object that converts
+        <summary>Returns a <c>SecretKeyFactory</c> object that converts
             secret keys of the specified algorithm.</summary>
-        <returns>the new &lt;code&gt;SecretKeyFactory&lt;/code&gt; object.</returns>
+        <returns>the new <c>SecretKeyFactory</c> object.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -260,9 +260,9 @@
             Java Cryptography Architecture Standard Algorithm Name Documentation</see>
             for information about standard algorithm names.</param>
         <param name="provider">the provider.</param>
-        <summary>Returns a &lt;code&gt;SecretKeyFactory&lt;/code&gt; object that converts
+        <summary>Returns a <c>SecretKeyFactory</c> object that converts
             secret keys of the specified algorithm.</summary>
-        <returns>the new &lt;code&gt;SecretKeyFactory&lt;/code&gt; object.</returns>
+        <returns>the new <c>SecretKeyFactory</c> object.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -313,9 +313,9 @@
             Java Cryptography Architecture Standard Algorithm Name Documentation</see>
             for information about standard algorithm names.</param>
         <param name="provider">the name of the provider.</param>
-        <summary>Returns a &lt;code&gt;SecretKeyFactory&lt;/code&gt; object that converts
+        <summary>Returns a <c>SecretKeyFactory</c> object that converts
             secret keys of the specified algorithm.</summary>
-        <returns>the new &lt;code&gt;SecretKeyFactory&lt;/code&gt; object.</returns>
+        <returns>the new <c>SecretKeyFactory</c> object.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -436,8 +436,8 @@
         <ReturnType>Java.Security.Provider</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Returns the provider of this &lt;code&gt;SecretKeyFactory&lt;/code&gt; object.</summary>
-        <value>the provider of this &lt;code&gt;SecretKeyFactory&lt;/code&gt; object</value>
+        <summary>Returns the provider of this <c>SecretKeyFactory</c> object.</summary>
+        <value>the provider of this <c>SecretKeyFactory</c> object</value>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Javax.Crypto/SecretKeyFactorySpi.xml b/docs/Mono.Android/en/Javax.Crypto/SecretKeyFactorySpi.xml
index 4b5599321b..cd7af641f5 100644
--- a/docs/Mono.Android/en/Javax.Crypto/SecretKeyFactorySpi.xml
+++ b/docs/Mono.Android/en/Javax.Crypto/SecretKeyFactorySpi.xml
@@ -19,7 +19,7 @@
   </Attributes>
   <Docs since="1">
     <summary>This class defines the <i>Service Provider Interface</i> (&lt;b&gt;SPI&lt;/b&gt;)
-            for the &lt;code&gt;SecretKeyFactory&lt;/code&gt; class.</summary>
+            for the <c>SecretKeyFactory</c> class.</summary>
     <remarks>
       <para>
         <format type="text/html">
@@ -106,7 +106,7 @@
       </Parameters>
       <Docs>
         <param name="keySpec">the specification (key material) of the secret key</param>
-        <summary>Generates a &lt;code&gt;SecretKey&lt;/code&gt; object from the
+        <summary>Generates a <c>SecretKey</c> object from the
             provided key specification (key material).</summary>
         <returns>the secret key</returns>
         <remarks>
diff --git a/docs/Mono.Android/en/Javax.Net.Ssl/ExtendedSSLSession.xml b/docs/Mono.Android/en/Javax.Net.Ssl/ExtendedSSLSession.xml
index 373df05ac1..3ac8643f53 100644
--- a/docs/Mono.Android/en/Javax.Net.Ssl/ExtendedSSLSession.xml
+++ b/docs/Mono.Android/en/Javax.Net.Ssl/ExtendedSSLSession.xml
@@ -31,7 +31,7 @@
     </Attribute>
   </Attributes>
   <Docs>
-    <summary>Extends the &lt;code&gt;SSLSession&lt;/code&gt; interface to support additional
+    <summary>Extends the <c>SSLSession</c> interface to support additional
             session attributes.</summary>
     <remarks>
       <para>
@@ -865,9 +865,9 @@
         <param name="name">the name to which the data object will be bound.
                      This may not be null.</param>
         <param name="value">the data object to be bound. This may not be null.</param>
-        <summary>Binds the specified &lt;code&gt;value&lt;/code&gt; object into the
+        <summary>Binds the specified <c>value</c> object into the
             session's application layer data
-            with the given &lt;code&gt;name&lt;/code&gt;.</summary>
+            with the given <c>name</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Javax.Net.Ssl/HandshakeCompletedEvent.xml b/docs/Mono.Android/en/Javax.Net.Ssl/HandshakeCompletedEvent.xml
index 5045964b7b..4278eecf17 100644
--- a/docs/Mono.Android/en/Javax.Net.Ssl/HandshakeCompletedEvent.xml
+++ b/docs/Mono.Android/en/Javax.Net.Ssl/HandshakeCompletedEvent.xml
@@ -399,7 +399,7 @@
       </ReturnValue>
       <Docs>
         <summary>Returns the session that triggered this event.</summary>
-        <value>the &lt;code&gt;SSLSession&lt;/code&gt; for this handshake</value>
+        <value>the <c>SSLSession</c> for this handshake</value>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Javax.Net.Ssl/HttpsURLConnection.xml b/docs/Mono.Android/en/Javax.Net.Ssl/HttpsURLConnection.xml
index 81a1800864..65145b2df6 100644
--- a/docs/Mono.Android/en/Javax.Net.Ssl/HttpsURLConnection.xml
+++ b/docs/Mono.Android/en/Javax.Net.Ssl/HttpsURLConnection.xml
@@ -18,7 +18,8 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>&lt;code&gt;HttpsURLConnection&lt;/code&gt; extends &lt;code&gt;HttpURLConnection&lt;/code&gt;
+    <summary>
+      <c>HttpsURLConnection</c> extends <c>HttpURLConnection</c>
             with support for https-specific features.</summary>
     <remarks>
       <para>
@@ -56,7 +57,7 @@
       </Parameters>
       <Docs>
         <param name="url">the URL</param>
-        <summary>Creates an &lt;code&gt;HttpsURLConnection&lt;/code&gt; using the
+        <summary>Creates an <c>HttpsURLConnection</c> using the
             URL specified.</summary>
         <remarks>
           <para>
@@ -151,8 +152,8 @@
       </ReturnValue>
       <Docs>
         <param name="v">the default host name verifier</param>
-        <summary>Gets the default &lt;code&gt;HostnameVerifier&lt;/code&gt; that is inherited
-            by new instances of this class. -or- Sets the default &lt;code&gt;HostnameVerifier&lt;/code&gt; inherited by a
+        <summary>Gets the default <c>HostnameVerifier</c> that is inherited
+            by new instances of this class. -or- Sets the default <c>HostnameVerifier</c> inherited by a
             new instance of this class.</summary>
         <value>the default host name verifier</value>
         <remarks>
@@ -214,10 +215,10 @@
       </ReturnValue>
       <Docs>
         <param name="sf">the default SSL socket factory</param>
-        <summary>Gets the default static &lt;code&gt;SSLSocketFactory&lt;/code&gt; that is
-            inherited by new instances of this class. -or- Sets the default &lt;code&gt;SSLSocketFactory&lt;/code&gt; inherited by new
+        <summary>Gets the default static <c>SSLSocketFactory</c> that is
+            inherited by new instances of this class. -or- Sets the default <c>SSLSocketFactory</c> inherited by new
             instances of this class.</summary>
-        <value>the default &lt;code&gt;SSLSocketFactory&lt;/code&gt;</value>
+        <value>the default <c>SSLSocketFactory</c></value>
         <remarks>
           <para>Property getter documentation:</para>
           <para>
@@ -365,7 +366,7 @@
       </ReturnValue>
       <Docs>
         <param name="v">the host name verifier</param>
-        <summary>Gets the &lt;code&gt;HostnameVerifier&lt;/code&gt; in place on this instance. -or- Sets the &lt;code&gt;HostnameVerifier&lt;/code&gt; for this instance.</summary>
+        <summary>Gets the <c>HostnameVerifier</c> in place on this instance. -or- Sets the <c>HostnameVerifier</c> for this instance.</summary>
         <value>the host name verifier</value>
         <remarks>
           <para>Property getter documentation:</para>
@@ -543,9 +544,9 @@
       <Docs>
         <param name="sf">the SSL socket factory</param>
         <summary>Gets the SSL socket factory to be used when creating sockets
-            for secure https URL connections. -or- Sets the &lt;code&gt;SSLSocketFactory&lt;/code&gt; to be used when this instance
+            for secure https URL connections. -or- Sets the <c>SSLSocketFactory</c> to be used when this instance
             creates sockets for secure https URL connections.</summary>
-        <value>the &lt;code&gt;SSLSocketFactory&lt;/code&gt;</value>
+        <value>the <c>SSLSocketFactory</c></value>
         <remarks>
           <para>Property getter documentation:</para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Net.Ssl/ISSLSession.xml b/docs/Mono.Android/en/Javax.Net.Ssl/ISSLSession.xml
index 93205ff722..8b8b753120 100644
--- a/docs/Mono.Android/en/Javax.Net.Ssl/ISSLSession.xml
+++ b/docs/Mono.Android/en/Javax.Net.Ssl/ISSLSession.xml
@@ -674,9 +674,9 @@
         <param name="name">the name to which the data object will be bound.
                      This may not be null.</param>
         <param name="value">the data object to be bound. This may not be null.</param>
-        <summary>Binds the specified &lt;code&gt;value&lt;/code&gt; object into the
+        <summary>Binds the specified <c>value</c> object into the
             session's application layer data
-            with the given &lt;code&gt;name&lt;/code&gt;.</summary>
+            with the given <c>name</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Javax.Net.Ssl/ISSLSessionContext.xml b/docs/Mono.Android/en/Javax.Net.Ssl/ISSLSessionContext.xml
index 5b017e3730..1809252329 100644
--- a/docs/Mono.Android/en/Javax.Net.Ssl/ISSLSessionContext.xml
+++ b/docs/Mono.Android/en/Javax.Net.Ssl/ISSLSessionContext.xml
@@ -25,8 +25,8 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>A &lt;code&gt;SSLSessionContext&lt;/code&gt; represents a set of
-            &lt;code&gt;SSLSession&lt;/code&gt;s associated with a single entity.</summary>
+    <summary>A <c>SSLSessionContext</c> represents a set of
+            <c>SSLSession</c>s associated with a single entity.</summary>
     <remarks>
       <para>
         <format type="text/html">
@@ -66,8 +66,8 @@
       </Parameters>
       <Docs>
         <param name="sessionId">the Session identifier</param>
-        <summary>Returns the &lt;code&gt;SSLSession&lt;/code&gt; bound to the specified session id.</summary>
-        <returns>the &lt;code&gt;SSLSession&lt;/code&gt; or null if
+        <summary>Returns the <c>SSLSession</c> bound to the specified session id.</summary>
+        <returns>the <c>SSLSession</c> or null if
             the specified session id does not refer to a valid SSLSession.</returns>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Net.Ssl/KeyManagerFactory.xml b/docs/Mono.Android/en/Javax.Net.Ssl/KeyManagerFactory.xml
index 5e1b61807e..021dec54c6 100644
--- a/docs/Mono.Android/en/Javax.Net.Ssl/KeyManagerFactory.xml
+++ b/docs/Mono.Android/en/Javax.Net.Ssl/KeyManagerFactory.xml
@@ -119,8 +119,8 @@
         <ReturnType>System.String</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Returns the algorithm name of this &lt;code&gt;KeyManagerFactory&lt;/code&gt; object.</summary>
-        <value>the algorithm name of this &lt;code&gt;KeyManagerFactory&lt;/code&gt; object.</value>
+        <summary>Returns the algorithm name of this <c>KeyManagerFactory</c> object.</summary>
+        <value>the algorithm name of this <c>KeyManagerFactory</c> object.</value>
         <remarks>
           <para>
             <format type="text/html">
@@ -202,9 +202,9 @@
                      See the <see href="https://docs.oracle.com/javase/8/docs/technotes/guides/security/jsse/JSSERefGuide.html">
                      Java Secure Socket Extension Reference Guide </see>
                      for information about standard algorithm names.</param>
-        <summary>Returns a &lt;code&gt;KeyManagerFactory&lt;/code&gt; object that acts as a
+        <summary>Returns a <c>KeyManagerFactory</c> object that acts as a
             factory for key managers.</summary>
-        <returns>the new &lt;code&gt;KeyManagerFactory&lt;/code&gt; object.</returns>
+        <returns>the new <c>KeyManagerFactory</c> object.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -253,9 +253,9 @@
                      Java Secure Socket Extension Reference Guide </see>
                      for information about standard algorithm names.</param>
         <param name="provider">an instance of the provider.</param>
-        <summary>Returns a &lt;code&gt;KeyManagerFactory&lt;/code&gt; object that acts as a
+        <summary>Returns a <c>KeyManagerFactory</c> object that acts as a
             factory for key managers.</summary>
-        <returns>the new &lt;code&gt;KeyManagerFactory&lt;/code&gt; object.</returns>
+        <returns>the new <c>KeyManagerFactory</c> object.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -305,9 +305,9 @@
                      Java Secure Socket Extension Reference Guide </see>
                      for information about standard algorithm names.</param>
         <param name="provider">the name of the provider.</param>
-        <summary>Returns a &lt;code&gt;KeyManagerFactory&lt;/code&gt; object that acts as a
+        <summary>Returns a <c>KeyManagerFactory</c> object that acts as a
             factory for key managers.</summary>
-        <returns>the new &lt;code&gt;KeyManagerFactory&lt;/code&gt; object.</returns>
+        <returns>the new <c>KeyManagerFactory</c> object.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -508,8 +508,8 @@
         <ReturnType>Java.Security.Provider</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Returns the provider of this &lt;code&gt;KeyManagerFactory&lt;/code&gt; object.</summary>
-        <value>the provider of this &lt;code&gt;KeyManagerFactory&lt;/code&gt; object</value>
+        <summary>Returns the provider of this <c>KeyManagerFactory</c> object.</summary>
+        <value>the provider of this <c>KeyManagerFactory</c> object</value>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Javax.Net.Ssl/KeyManagerFactorySpi.xml b/docs/Mono.Android/en/Javax.Net.Ssl/KeyManagerFactorySpi.xml
index e7a0b33f6d..d1b807202f 100644
--- a/docs/Mono.Android/en/Javax.Net.Ssl/KeyManagerFactorySpi.xml
+++ b/docs/Mono.Android/en/Javax.Net.Ssl/KeyManagerFactorySpi.xml
@@ -19,7 +19,7 @@
   </Attributes>
   <Docs since="1">
     <summary>This class defines the <i>Service Provider Interface</i> (&lt;b&gt;SPI&lt;/b&gt;)
-            for the &lt;code&gt;KeyManagerFactory&lt;/code&gt; class.</summary>
+            for the <c>KeyManagerFactory</c> class.</summary>
     <remarks>
       <para>
         <format type="text/html">
diff --git a/docs/Mono.Android/en/Javax.Net.Ssl/SSLContext.xml b/docs/Mono.Android/en/Javax.Net.Ssl/SSLContext.xml
index f18df7a08e..58d01a5391 100644
--- a/docs/Mono.Android/en/Javax.Net.Ssl/SSLContext.xml
+++ b/docs/Mono.Android/en/Javax.Net.Ssl/SSLContext.xml
@@ -20,7 +20,7 @@
   <Docs since="1">
     <summary>Instances of this class represent a secure socket protocol
             implementation which acts as a factory for secure socket
-            factories or &lt;code&gt;SSLEngine&lt;/code&gt;s.</summary>
+            factories or <c>SSLEngine</c>s.</summary>
     <remarks>
       <para>
         <format type="text/html">
@@ -160,8 +160,8 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Creates a new &lt;code&gt;SSLEngine&lt;/code&gt; using this context.</summary>
-        <returns>the &lt;code&gt;SSLEngine&lt;/code&gt; object</returns>
+        <summary>Creates a new <c>SSLEngine</c> using this context.</summary>
+        <returns>the <c>SSLEngine</c> object</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -205,9 +205,9 @@
       <Docs>
         <param name="peerHost">the non-authoritative name of the host</param>
         <param name="peerPort">the non-authoritative port</param>
-        <summary>Creates a new &lt;code&gt;SSLEngine&lt;/code&gt; using this context using
+        <summary>Creates a new <c>SSLEngine</c> using this context using
             advisory peer information.</summary>
-        <returns>the new &lt;code&gt;SSLEngine&lt;/code&gt; object</returns>
+        <returns>the new <c>SSLEngine</c> object</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -344,9 +344,9 @@
                      Java Cryptography Architecture Standard Algorithm Name
                      Documentation</see>
                      for information about standard protocol names.</param>
-        <summary>Returns a &lt;code&gt;SSLContext&lt;/code&gt; object that implements the
+        <summary>Returns a <c>SSLContext</c> object that implements the
             specified secure socket protocol.</summary>
-        <returns>the new &lt;code&gt;SSLContext&lt;/code&gt; object.</returns>
+        <returns>the new <c>SSLContext</c> object.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -396,9 +396,9 @@
                      Documentation</see>
                      for information about standard protocol names.</param>
         <param name="provider">an instance of the provider.</param>
-        <summary>Returns a &lt;code&gt;SSLContext&lt;/code&gt; object that implements the
+        <summary>Returns a <c>SSLContext</c> object that implements the
             specified secure socket protocol.</summary>
-        <returns>the new &lt;code&gt;SSLContext&lt;/code&gt; object.</returns>
+        <returns>the new <c>SSLContext</c> object.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -449,9 +449,9 @@
                      Documentation</see>
                      for information about standard protocol names.</param>
         <param name="provider">the name of the provider.</param>
-        <summary>Returns a &lt;code&gt;SSLContext&lt;/code&gt; object that implements the
+        <summary>Returns a <c>SSLContext</c> object that implements the
             specified secure socket protocol.</summary>
-        <returns>the new &lt;code&gt;SSLContext&lt;/code&gt; object.</returns>
+        <returns>the new <c>SSLContext</c> object.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -570,8 +570,8 @@
         <ReturnType>System.String</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Returns the protocol name of this &lt;code&gt;SSLContext&lt;/code&gt; object.</summary>
-        <value>the protocol name of this &lt;code&gt;SSLContext&lt;/code&gt; object.</value>
+        <summary>Returns the protocol name of this <c>SSLContext</c> object.</summary>
+        <value>the protocol name of this <c>SSLContext</c> object.</value>
         <remarks>
           <para>
             <format type="text/html">
@@ -607,8 +607,8 @@
         <ReturnType>Java.Security.Provider</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Returns the provider of this &lt;code&gt;SSLContext&lt;/code&gt; object.</summary>
-        <value>the provider of this &lt;code&gt;SSLContext&lt;/code&gt; object</value>
+        <summary>Returns the provider of this <c>SSLContext</c> object.</summary>
+        <value>the provider of this <c>SSLContext</c> object</value>
         <remarks>
           <para>
             <format type="text/html">
@@ -683,9 +683,9 @@
         <ReturnType>Javax.Net.Ssl.SSLServerSocketFactory</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Returns a &lt;code&gt;ServerSocketFactory&lt;/code&gt; object for
+        <summary>Returns a <c>ServerSocketFactory</c> object for
             this context.</summary>
-        <value>the &lt;code&gt;ServerSocketFactory&lt;/code&gt; object</value>
+        <value>the <c>ServerSocketFactory</c> object</value>
         <remarks>
           <para>
             <format type="text/html">
@@ -721,9 +721,9 @@
         <ReturnType>Javax.Net.Ssl.SSLSocketFactory</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Returns a &lt;code&gt;SocketFactory&lt;/code&gt; object for this
+        <summary>Returns a <c>SocketFactory</c> object for this
             context.</summary>
-        <value>the &lt;code&gt;SocketFactory&lt;/code&gt; object</value>
+        <value>the <c>SocketFactory</c> object</value>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Javax.Net.Ssl/SSLContextSpi.xml b/docs/Mono.Android/en/Javax.Net.Ssl/SSLContextSpi.xml
index 5d439f4cb6..7c5c048573 100644
--- a/docs/Mono.Android/en/Javax.Net.Ssl/SSLContextSpi.xml
+++ b/docs/Mono.Android/en/Javax.Net.Ssl/SSLContextSpi.xml
@@ -19,7 +19,7 @@
   </Attributes>
   <Docs since="1">
     <summary>This class defines the <i>Service Provider Interface</i> (&lt;b&gt;SPI&lt;/b&gt;)
-            for the &lt;code&gt;SSLContext&lt;/code&gt; class.</summary>
+            for the <c>SSLContext</c> class.</summary>
     <remarks>
       <para>
         <format type="text/html">
@@ -103,8 +103,8 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Creates a new &lt;code&gt;SSLEngine&lt;/code&gt; using this context.</summary>
-        <returns>the &lt;code&gt;SSLEngine&lt;/code&gt; Object</returns>
+        <summary>Creates a new <c>SSLEngine</c> using this context.</summary>
+        <returns>the <c>SSLEngine</c> Object</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -148,8 +148,8 @@
       <Docs>
         <param name="host">the non-authoritative name of the host</param>
         <param name="port">the non-authoritative port</param>
-        <summary>Creates a &lt;code&gt;SSLEngine&lt;/code&gt; using this context.</summary>
-        <returns>the &lt;code&gt;SSLEngine&lt;/code&gt; Object</returns>
+        <summary>Creates a <c>SSLEngine</c> using this context.</summary>
+        <returns>the <c>SSLEngine</c> Object</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -188,9 +188,9 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Returns a client &lt;code&gt;SSLSessionContext&lt;/code&gt; object for
+        <summary>Returns a client <c>SSLSessionContext</c> object for
             this context.</summary>
-        <returns>the &lt;code&gt;SSLSessionContext&lt;/code&gt; object</returns>
+        <returns>the <c>SSLSessionContext</c> object</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -266,9 +266,9 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Returns a server &lt;code&gt;SSLSessionContext&lt;/code&gt; object for
+        <summary>Returns a server <c>SSLSessionContext</c> object for
             this context.</summary>
-        <returns>the &lt;code&gt;SSLSessionContext&lt;/code&gt; object</returns>
+        <returns>the <c>SSLSessionContext</c> object</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -305,9 +305,9 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Returns a &lt;code&gt;ServerSocketFactory&lt;/code&gt; object for
+        <summary>Returns a <c>ServerSocketFactory</c> object for
             this context.</summary>
-        <returns>the &lt;code&gt;ServerSocketFactory&lt;/code&gt; object</returns>
+        <returns>the <c>ServerSocketFactory</c> object</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -344,9 +344,9 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Returns a &lt;code&gt;SocketFactory&lt;/code&gt; object for this
+        <summary>Returns a <c>SocketFactory</c> object for this
             context.</summary>
-        <returns>the &lt;code&gt;SocketFactory&lt;/code&gt; object</returns>
+        <returns>the <c>SocketFactory</c> object</returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Javax.Net.Ssl/SSLEngine.xml b/docs/Mono.Android/en/Javax.Net.Ssl/SSLEngine.xml
index 7ba6da254e..d8155e3a1d 100644
--- a/docs/Mono.Android/en/Javax.Net.Ssl/SSLEngine.xml
+++ b/docs/Mono.Android/en/Javax.Net.Ssl/SSLEngine.xml
@@ -54,7 +54,7 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <summary>Constructor for an &lt;code&gt;SSLEngine&lt;/code&gt; providing no hints
+        <summary>Constructor for an <c>SSLEngine</c> providing no hints
             for an internal session reuse strategy.</summary>
         <remarks>
           <para>
@@ -117,7 +117,7 @@
       <Docs>
         <param name="peerHost">the name of the peer host</param>
         <param name="peerPort">the port number of the peer</param>
-        <summary>Constructor for an &lt;code&gt;SSLEngine&lt;/code&gt;.</summary>
+        <summary>Constructor for an <c>SSLEngine</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -237,7 +237,7 @@
       <Parameters />
       <Docs>
         <summary>Signals that no more inbound network data will be sent
-            to this &lt;code&gt;SSLEngine&lt;/code&gt;.</summary>
+            to this <c>SSLEngine</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -278,7 +278,7 @@
       <Parameters />
       <Docs>
         <summary>Signals that no more outbound application data will be sent
-            on this &lt;code&gt;SSLEngine&lt;/code&gt;.</summary>
+            on this <c>SSLEngine</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -415,7 +415,7 @@
       <Parameters />
       <Docs>
         <summary>Returns the names of the protocol versions which are currently
-            enabled for use with this &lt;code&gt;SSLEngine&lt;/code&gt;.</summary>
+            enabled for use with this <c>SSLEngine</c>.</summary>
         <returns>an array of protocols</returns>
         <remarks>
           <para>
@@ -493,7 +493,7 @@
       <Parameters />
       <Docs>
         <summary>Returns the names of the protocols which could be enabled for use
-            with this &lt;code&gt;SSLEngine&lt;/code&gt;.</summary>
+            with this <c>SSLEngine</c>.</summary>
         <returns>an array of protocols supported</returns>
         <remarks>
           <para>
@@ -1114,11 +1114,11 @@
         <Parameter Name="dst" Type="Java.Nio.ByteBuffer" />
       </Parameters>
       <Docs>
-        <param name="src">a &lt;code&gt;ByteBuffer&lt;/code&gt; containing inbound network data.</param>
-        <param name="dst">a &lt;code&gt;ByteBuffer&lt;/code&gt; to hold inbound application data.</param>
+        <param name="src">a <c>ByteBuffer</c> containing inbound network data.</param>
+        <param name="dst">a <c>ByteBuffer</c> to hold inbound application data.</param>
         <summary>Attempts to decode SSL/TLS network data into a plaintext
             application data buffer.</summary>
-        <returns>an &lt;code&gt;SSLEngineResult&lt;/code&gt; describing the result
+        <returns>an <c>SSLEngineResult</c> describing the result
                      of this operation.</returns>
         <remarks>
           <para>
@@ -1165,12 +1165,12 @@
         <Parameter Name="dsts" Type="Java.Nio.ByteBuffer[]" />
       </Parameters>
       <Docs>
-        <param name="src">a &lt;code&gt;ByteBuffer&lt;/code&gt; containing inbound network data.</param>
-        <param name="dsts">an array of &lt;code&gt;ByteBuffer&lt;/code&gt;s to hold inbound
+        <param name="src">a <c>ByteBuffer</c> containing inbound network data.</param>
+        <param name="dsts">an array of <c>ByteBuffer</c>s to hold inbound
                      application data.</param>
         <summary>Attempts to decode SSL/TLS network data into a sequence of plaintext
             application data buffers.</summary>
-        <returns>an &lt;code&gt;SSLEngineResult&lt;/code&gt; describing the result
+        <returns>an <c>SSLEngineResult</c> describing the result
                      of this operation.</returns>
         <remarks>
           <para>
@@ -1219,18 +1219,18 @@
         <Parameter Name="length" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="src">a &lt;code&gt;ByteBuffer&lt;/code&gt; containing inbound network data.</param>
-        <param name="dsts">an array of &lt;code&gt;ByteBuffer&lt;/code&gt;s to hold inbound
+        <param name="src">a <c>ByteBuffer</c> containing inbound network data.</param>
+        <param name="dsts">an array of <c>ByteBuffer</c>s to hold inbound
                      application data.</param>
         <param name="offset">The offset within the buffer array of the first buffer from
                      which bytes are to be transferred; it must be non-negative
-                     and no larger than &lt;code&gt;dsts.length&lt;/code&gt;.</param>
+                     and no larger than <c>dsts.length</c>.</param>
         <param name="length">The maximum number of buffers to be accessed; it must be
                      non-negative and no larger than
-                     &lt;code&gt;dsts.length&lt;/code&gt;&amp;nbsp;-&amp;nbsp;&lt;code&gt;offset&lt;/code&gt;.</param>
+                     <c>dsts.length</c>&amp;nbsp;-&amp;nbsp;<c>offset</c>.</param>
         <summary>Attempts to decode SSL/TLS network data into a subsequence of
             plaintext application data buffers.</summary>
-        <returns>an &lt;code&gt;SSLEngineResult&lt;/code&gt; describing the result
+        <returns>an <c>SSLEngineResult</c> describing the result
                      of this operation.</returns>
         <remarks>
           <para>
@@ -1363,11 +1363,11 @@
         <Parameter Name="dst" Type="Java.Nio.ByteBuffer" />
       </Parameters>
       <Docs>
-        <param name="src">a &lt;code&gt;ByteBuffer&lt;/code&gt; containing outbound application data</param>
-        <param name="dst">a &lt;code&gt;ByteBuffer&lt;/code&gt; to hold outbound network data</param>
+        <param name="src">a <c>ByteBuffer</c> containing outbound application data</param>
+        <param name="dst">a <c>ByteBuffer</c> to hold outbound network data</param>
         <summary>Attempts to encode a buffer of plaintext application data into
             SSL/TLS network data.</summary>
-        <returns>an &lt;code&gt;SSLEngineResult&lt;/code&gt; describing the result
+        <returns>an <c>SSLEngineResult</c> describing the result
                      of this operation.</returns>
         <remarks>
           <para>
@@ -1414,12 +1414,12 @@
         <Parameter Name="dst" Type="Java.Nio.ByteBuffer" />
       </Parameters>
       <Docs>
-        <param name="srcs">an array of &lt;code&gt;ByteBuffers&lt;/code&gt; containing the
+        <param name="srcs">an array of <c>ByteBuffers</c> containing the
                      outbound application data</param>
-        <param name="dst">a &lt;code&gt;ByteBuffer&lt;/code&gt; to hold outbound network data</param>
+        <param name="dst">a <c>ByteBuffer</c> to hold outbound network data</param>
         <summary>Attempts to encode plaintext bytes from a sequence of data
             buffers into SSL/TLS network data.</summary>
-        <returns>an &lt;code&gt;SSLEngineResult&lt;/code&gt; describing the result
+        <returns>an <c>SSLEngineResult</c> describing the result
                      of this operation.</returns>
         <remarks>
           <para>
@@ -1468,18 +1468,18 @@
         <Parameter Name="dst" Type="Java.Nio.ByteBuffer" />
       </Parameters>
       <Docs>
-        <param name="srcs">an array of &lt;code&gt;ByteBuffers&lt;/code&gt; containing the
+        <param name="srcs">an array of <c>ByteBuffers</c> containing the
                      outbound application data</param>
         <param name="offset">The offset within the buffer array of the first buffer from
                      which bytes are to be retrieved; it must be non-negative
-                     and no larger than &lt;code&gt;srcs.length&lt;/code&gt;</param>
+                     and no larger than <c>srcs.length</c></param>
         <param name="length">The maximum number of buffers to be accessed; it must be
                      non-negative and no larger than
-                     &lt;code&gt;srcs.length&lt;/code&gt;&amp;nbsp;-&amp;nbsp;&lt;code&gt;offset&lt;/code&gt;</param>
-        <param name="dst">a &lt;code&gt;ByteBuffer&lt;/code&gt; to hold outbound network data</param>
+                     <c>srcs.length</c>&amp;nbsp;-&amp;nbsp;<c>offset</c></param>
+        <param name="dst">a <c>ByteBuffer</c> to hold outbound network data</param>
         <summary>Attempts to encode plaintext bytes from a subsequence of data
             buffers into SSL/TLS network data.</summary>
-        <returns>an &lt;code&gt;SSLEngineResult&lt;/code&gt; describing the result
+        <returns>an <c>SSLEngineResult</c> describing the result
                      of this operation.</returns>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Net.Ssl/SSLEngineResult+HandshakeStatus.xml b/docs/Mono.Android/en/Javax.Net.Ssl/SSLEngineResult+HandshakeStatus.xml
index 1c9499638d..3aacf83409 100644
--- a/docs/Mono.Android/en/Javax.Net.Ssl/SSLEngineResult+HandshakeStatus.xml
+++ b/docs/Mono.Android/en/Javax.Net.Ssl/SSLEngineResult+HandshakeStatus.xml
@@ -18,8 +18,8 @@
     </Attribute>
   </Attributes>
   <Docs>
-    <summary>An &lt;code&gt;SSLEngineResult&lt;/code&gt; enum describing the current
-            handshaking state of this &lt;code&gt;SSLEngine&lt;/code&gt;.</summary>
+    <summary>An <c>SSLEngineResult</c> enum describing the current
+            handshaking state of this <c>SSLEngine</c>.</summary>
     <remarks>
       <para>
         <format type="text/html">
diff --git a/docs/Mono.Android/en/Javax.Net.Ssl/SSLEngineResult+Status.xml b/docs/Mono.Android/en/Javax.Net.Ssl/SSLEngineResult+Status.xml
index 1012895077..1562f41e08 100644
--- a/docs/Mono.Android/en/Javax.Net.Ssl/SSLEngineResult+Status.xml
+++ b/docs/Mono.Android/en/Javax.Net.Ssl/SSLEngineResult+Status.xml
@@ -18,8 +18,8 @@
     </Attribute>
   </Attributes>
   <Docs>
-    <summary>An &lt;code&gt;SSLEngineResult&lt;/code&gt; enum describing the overall result
-            of the &lt;code&gt;SSLEngine&lt;/code&gt; operation.</summary>
+    <summary>An <c>SSLEngineResult</c> enum describing the overall result
+            of the <c>SSLEngine</c> operation.</summary>
     <remarks>
       <para>
         <format type="text/html">
diff --git a/docs/Mono.Android/en/Javax.Net.Ssl/SSLEngineResult.xml b/docs/Mono.Android/en/Javax.Net.Ssl/SSLEngineResult.xml
index 0f41f0396d..4138865ee5 100644
--- a/docs/Mono.Android/en/Javax.Net.Ssl/SSLEngineResult.xml
+++ b/docs/Mono.Android/en/Javax.Net.Ssl/SSLEngineResult.xml
@@ -19,7 +19,7 @@
   </Attributes>
   <Docs since="1">
     <summary>An encapsulation of the result state produced by
-            &lt;code&gt;SSLEngine&lt;/code&gt; I/O calls.</summary>
+            <c>SSLEngine</c> I/O calls.</summary>
     <remarks>
       <para>
         <format type="text/html">
diff --git a/docs/Mono.Android/en/Javax.Net.Ssl/SSLException.xml b/docs/Mono.Android/en/Javax.Net.Ssl/SSLException.xml
index 6677411c6f..8d1a53588c 100644
--- a/docs/Mono.Android/en/Javax.Net.Ssl/SSLException.xml
+++ b/docs/Mono.Android/en/Javax.Net.Ssl/SSLException.xml
@@ -58,7 +58,7 @@
                      <c>#getCause()</c> method).  (A <c>null</c> value is
                      permitted, and indicates that the cause is nonexistent or
                      unknown.)</param>
-        <summary>Creates a &lt;code&gt;SSLException&lt;/code&gt; with the specified cause
+        <summary>Creates a <c>SSLException</c> with the specified cause
             and a detail message of <c>(cause==null ? null : cause.toString())</c>
             (which typically contains the class and detail message of
             <c>cause</c>).</summary>
@@ -165,7 +165,7 @@
                      <c>#getCause()</c> method).  (A <c>null</c> value is
                      permitted, and indicates that the cause is nonexistent or
                      unknown.)</param>
-        <summary>Creates a &lt;code&gt;SSLException&lt;/code&gt; with the specified
+        <summary>Creates a <c>SSLException</c> with the specified
             detail message and cause.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Net.Ssl/SSLServerSocket.xml b/docs/Mono.Android/en/Javax.Net.Ssl/SSLServerSocket.xml
index e06475ee92..2aff92e9eb 100644
--- a/docs/Mono.Android/en/Javax.Net.Ssl/SSLServerSocket.xml
+++ b/docs/Mono.Android/en/Javax.Net.Ssl/SSLServerSocket.xml
@@ -18,7 +18,7 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>This class extends &lt;code&gt;ServerSocket&lt;/code&gt;s and
+    <summary>This class extends <c>ServerSocket</c>s and
             provides secure server sockets using protocols such as the Secure
             Sockets Layer (SSL) or Transport Layer Security (TLS) protocols.</summary>
     <remarks>
diff --git a/docs/Mono.Android/en/Javax.Net.Ssl/SSLServerSocketFactory.xml b/docs/Mono.Android/en/Javax.Net.Ssl/SSLServerSocketFactory.xml
index f62e72b0d9..8c601bf994 100644
--- a/docs/Mono.Android/en/Javax.Net.Ssl/SSLServerSocketFactory.xml
+++ b/docs/Mono.Android/en/Javax.Net.Ssl/SSLServerSocketFactory.xml
@@ -18,8 +18,9 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>&lt;code&gt;SSLServerSocketFactory&lt;/code&gt;s create
-            &lt;code&gt;SSLServerSocket&lt;/code&gt;s.</summary>
+    <summary>
+      <c>SSLServerSocketFactory</c>s create
+            <c>SSLServerSocket</c>s.</summary>
     <remarks>
       <para>
         <format type="text/html">
@@ -112,7 +113,7 @@
       </ReturnValue>
       <Docs>
         <summary>Returns the default SSL server socket factory.</summary>
-        <value>the default &lt;code&gt;ServerSocketFactory&lt;/code&gt;</value>
+        <value>the default <c>ServerSocketFactory</c></value>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Javax.Net.Ssl/SSLSessionBindingEvent.xml b/docs/Mono.Android/en/Javax.Net.Ssl/SSLSessionBindingEvent.xml
index 2eb076e7f5..2d685a0f15 100644
--- a/docs/Mono.Android/en/Javax.Net.Ssl/SSLSessionBindingEvent.xml
+++ b/docs/Mono.Android/en/Javax.Net.Ssl/SSLSessionBindingEvent.xml
@@ -187,7 +187,7 @@
       <Docs>
         <summary>Returns the SSLSession into which the listener is being bound or
             from which the listener is being unbound.</summary>
-        <value>the &lt;code&gt;SSLSession&lt;/code&gt;</value>
+        <value>the <c>SSLSession</c></value>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Javax.Net.Ssl/SSLSocket.xml b/docs/Mono.Android/en/Javax.Net.Ssl/SSLSocket.xml
index 0311bb4d92..75bfffca62 100644
--- a/docs/Mono.Android/en/Javax.Net.Ssl/SSLSocket.xml
+++ b/docs/Mono.Android/en/Javax.Net.Ssl/SSLSocket.xml
@@ -18,7 +18,7 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>This class extends &lt;code&gt;Socket&lt;/code&gt;s and provides secure
+    <summary>This class extends <c>Socket</c>s and provides secure
             socket using protocols such as the "Secure
             Sockets Layer" (SSL) or IETF "Transport Layer Security" (TLS) protocols.</summary>
     <remarks>
@@ -155,7 +155,7 @@
       </Parameters>
       <Docs>
         <param name="host">name of the host with which to connect, or
-                   &lt;code&gt;null&lt;/code&gt; for the loopback address.</param>
+                   <c>null</c> for the loopback address.</param>
         <param name="port">number of the server's port</param>
         <summary>Used only by subclasses.</summary>
         <remarks>
@@ -202,9 +202,9 @@
         <param name="address">the server's host</param>
         <param name="port">its port</param>
         <param name="clientAddress">the client's address the socket is bound to, or
-                   &lt;code&gt;null&lt;/code&gt; for the &lt;code&gt;anyLocal&lt;/code&gt; address.</param>
+                   <c>null</c> for the <c>anyLocal</c> address.</param>
         <param name="clientPort">the client's port the socket is bound to, or
-                   &lt;code&gt;zero&lt;/code&gt; for a system selected free port.</param>
+                   <c>zero</c> for a system selected free port.</param>
         <summary>Used only by subclasses.</summary>
         <remarks>
           <para>
@@ -247,12 +247,12 @@
       </Parameters>
       <Docs>
         <param name="host">name of the host with which to connect, or
-                   &lt;code&gt;null&lt;/code&gt; for the loopback address.</param>
+                   <c>null</c> for the loopback address.</param>
         <param name="port">number of the server's port</param>
         <param name="clientAddress">the client's address the socket is bound to, or
-                   &lt;code&gt;null&lt;/code&gt; for the &lt;code&gt;anyLocal&lt;/code&gt; address.</param>
+                   <c>null</c> for the <c>anyLocal</c> address.</param>
         <param name="clientPort">the client's port the socket is bound to, or
-                   &lt;code&gt;zero&lt;/code&gt; for a system selected free port.</param>
+                   <c>zero</c> for a system selected free port.</param>
         <summary>Used only by subclasses.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Net.Ssl/SSLSocketFactory.xml b/docs/Mono.Android/en/Javax.Net.Ssl/SSLSocketFactory.xml
index ffe131970e..2bd4d33b6a 100644
--- a/docs/Mono.Android/en/Javax.Net.Ssl/SSLSocketFactory.xml
+++ b/docs/Mono.Android/en/Javax.Net.Ssl/SSLSocketFactory.xml
@@ -18,7 +18,8 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>&lt;code&gt;SSLSocketFactory&lt;/code&gt;s create &lt;code&gt;SSLSocket&lt;/code&gt;s.</summary>
+    <summary>
+      <c>SSLSocketFactory</c>s create <c>SSLSocket</c>s.</summary>
     <remarks>
       <para>
         <format type="text/html">
@@ -162,7 +163,7 @@
       </ReturnValue>
       <Docs>
         <summary>Returns the default SSL socket factory.</summary>
-        <value>the default &lt;code&gt;SocketFactory&lt;/code&gt;</value>
+        <value>the default <c>SocketFactory</c></value>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Javax.Net.Ssl/TrustManagerFactory.xml b/docs/Mono.Android/en/Javax.Net.Ssl/TrustManagerFactory.xml
index 7bf0945b50..fa69d9f152 100644
--- a/docs/Mono.Android/en/Javax.Net.Ssl/TrustManagerFactory.xml
+++ b/docs/Mono.Android/en/Javax.Net.Ssl/TrustManagerFactory.xml
@@ -119,9 +119,9 @@
         <ReturnType>System.String</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Returns the algorithm name of this &lt;code&gt;TrustManagerFactory&lt;/code&gt;
+        <summary>Returns the algorithm name of this <c>TrustManagerFactory</c>
             object.</summary>
-        <value>the algorithm name of this &lt;code&gt;TrustManagerFactory&lt;/code&gt;
+        <value>the algorithm name of this <c>TrustManagerFactory</c>
                      object</value>
         <remarks>
           <para>
@@ -204,9 +204,9 @@
                      algorithm.  See the <see href="https://docs.oracle.com/javase/8/docs/technotes/guides/security/jsse/JSSERefGuide.html">
                      Java Secure Socket Extension Reference Guide </see>
                      for information about standard algorithm names.</param>
-        <summary>Returns a &lt;code&gt;TrustManagerFactory&lt;/code&gt; object that acts as a
+        <summary>Returns a <c>TrustManagerFactory</c> object that acts as a
             factory for trust managers.</summary>
-        <returns>the new &lt;code&gt;TrustManagerFactory&lt;/code&gt; object.</returns>
+        <returns>the new <c>TrustManagerFactory</c> object.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -255,9 +255,9 @@
                      Java Secure Socket Extension Reference Guide </see>
                      for information about standard algorithm names.</param>
         <param name="provider">an instance of the provider.</param>
-        <summary>Returns a &lt;code&gt;TrustManagerFactory&lt;/code&gt; object that acts as a
+        <summary>Returns a <c>TrustManagerFactory</c> object that acts as a
             factory for trust managers.</summary>
-        <returns>the new &lt;code&gt;TrustManagerFactory&lt;/code&gt; object.</returns>
+        <returns>the new <c>TrustManagerFactory</c> object.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -307,9 +307,9 @@
                      Java Secure Socket Extension Reference Guide </see>
                      for information about standard algorithm names.</param>
         <param name="provider">the name of the provider.</param>
-        <summary>Returns a &lt;code&gt;TrustManagerFactory&lt;/code&gt; object that acts as a
+        <summary>Returns a <c>TrustManagerFactory</c> object that acts as a
             factory for trust managers.</summary>
-        <returns>the new &lt;code&gt;TrustManagerFactory&lt;/code&gt; object</returns>
+        <returns>the new <c>TrustManagerFactory</c> object</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -507,8 +507,8 @@
         <ReturnType>Java.Security.Provider</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Returns the provider of this &lt;code&gt;TrustManagerFactory&lt;/code&gt; object.</summary>
-        <value>the provider of this &lt;code&gt;TrustManagerFactory&lt;/code&gt; object</value>
+        <summary>Returns the provider of this <c>TrustManagerFactory</c> object.</summary>
+        <value>the provider of this <c>TrustManagerFactory</c> object</value>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Javax.Net.Ssl/TrustManagerFactorySpi.xml b/docs/Mono.Android/en/Javax.Net.Ssl/TrustManagerFactorySpi.xml
index 276e2a2fcf..d710f02012 100644
--- a/docs/Mono.Android/en/Javax.Net.Ssl/TrustManagerFactorySpi.xml
+++ b/docs/Mono.Android/en/Javax.Net.Ssl/TrustManagerFactorySpi.xml
@@ -19,7 +19,7 @@
   </Attributes>
   <Docs since="1">
     <summary>This class defines the <i>Service Provider Interface</i> (&lt;b&gt;SPI&lt;/b&gt;)
-            for the &lt;code&gt;TrustManagerFactory&lt;/code&gt; class.</summary>
+            for the <c>TrustManagerFactory</c> class.</summary>
     <remarks>
       <para>
         <format type="text/html">
diff --git a/docs/Mono.Android/en/Javax.Net.Ssl/X509ExtendedKeyManager.xml b/docs/Mono.Android/en/Javax.Net.Ssl/X509ExtendedKeyManager.xml
index 8f2a103251..2435ad5ba4 100644
--- a/docs/Mono.Android/en/Javax.Net.Ssl/X509ExtendedKeyManager.xml
+++ b/docs/Mono.Android/en/Javax.Net.Ssl/X509ExtendedKeyManager.xml
@@ -191,12 +191,12 @@
                      with the most-preferred key type first.</param>
         <param name="issuers">the list of acceptable CA issuer subject names
                      or null if it does not matter which issuers are used.</param>
-        <param name="engine">the &lt;code&gt;SSLEngine&lt;/code&gt; to be used for this
+        <param name="engine">the <c>SSLEngine</c> to be used for this
                      connection.  This parameter can be null, which indicates
                      that implementations of this interface are free to
                      select an alias applicable to any engine.</param>
         <summary>Choose an alias to authenticate the client side of an
-            &lt;code&gt;SSLEngine&lt;/code&gt; connection given the public key type
+            <c>SSLEngine</c> connection given the public key type
             and the list of certificate issuer authorities recognized by
             the peer (if any).</summary>
         <returns>the alias name for the desired key, or null if there
@@ -244,12 +244,12 @@
         <param name="keyType">the key algorithm type name.</param>
         <param name="issuers">the list of acceptable CA issuer subject names
                      or null if it does not matter which issuers are used.</param>
-        <param name="engine">the &lt;code&gt;SSLEngine&lt;/code&gt; to be used for this
+        <param name="engine">the <c>SSLEngine</c> to be used for this
                      connection.  This parameter can be null, which indicates
                      that implementations of this interface are free to
                      select an alias applicable to any engine.</param>
         <summary>Choose an alias to authenticate the server side of an
-            &lt;code&gt;SSLEngine&lt;/code&gt; connection given the public key type
+            <c>SSLEngine</c> connection given the public key type
             and the list of certificate issuer authorities recognized by
             the peer (if any).</summary>
         <returns>the alias name for the desired key, or null if there
diff --git a/docs/Mono.Android/en/Javax.Net.Ssl/X509ExtendedTrustManager.xml b/docs/Mono.Android/en/Javax.Net.Ssl/X509ExtendedTrustManager.xml
index a075a7c9a8..7ebb8bf7a7 100644
--- a/docs/Mono.Android/en/Javax.Net.Ssl/X509ExtendedTrustManager.xml
+++ b/docs/Mono.Android/en/Javax.Net.Ssl/X509ExtendedTrustManager.xml
@@ -34,7 +34,7 @@
     </Attribute>
   </Attributes>
   <Docs>
-    <summary>Extensions to the &lt;code&gt;X509TrustManager&lt;/code&gt; interface to support
+    <summary>Extensions to the <c>X509TrustManager</c> interface to support
             SSL/TLS connection sensitive trust management.</summary>
     <remarks>
       <para>
diff --git a/docs/Mono.Android/en/Javax.Net/ServerSocketFactory.xml b/docs/Mono.Android/en/Javax.Net/ServerSocketFactory.xml
index 696e5edc71..f34cf689cc 100644
--- a/docs/Mono.Android/en/Javax.Net/ServerSocketFactory.xml
+++ b/docs/Mono.Android/en/Javax.Net/ServerSocketFactory.xml
@@ -155,7 +155,7 @@
       <Docs>
         <param name="port">the port to listen to</param>
         <summary>Returns a server socket bound to the specified port.</summary>
-        <returns>the &lt;code&gt;ServerSocket&lt;/code&gt;</returns>
+        <returns>the <c>ServerSocket</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -201,7 +201,7 @@
         <param name="backlog">how many connections are queued</param>
         <summary>Returns a server socket bound to the specified port, and uses the
             specified connection backlog.</summary>
-        <returns>the &lt;code&gt;ServerSocket&lt;/code&gt;</returns>
+        <returns>the <c>ServerSocket</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -249,7 +249,7 @@
         <param name="ifAddress">the network interface address to use</param>
         <summary>Returns a server socket bound to the specified port,
             with a specified listen backlog and local IP.</summary>
-        <returns>the &lt;code&gt;ServerSocket&lt;/code&gt;</returns>
+        <returns>the <c>ServerSocket</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -288,7 +288,7 @@
       </ReturnValue>
       <Docs>
         <summary>Returns a copy of the environment's default socket factory.</summary>
-        <value>the &lt;code&gt;ServerSocketFactory&lt;/code&gt;</value>
+        <value>the <c>ServerSocketFactory</c></value>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Javax.Net/SocketFactory.xml b/docs/Mono.Android/en/Javax.Net/SocketFactory.xml
index c97ae8bff3..031a1575cb 100644
--- a/docs/Mono.Android/en/Javax.Net/SocketFactory.xml
+++ b/docs/Mono.Android/en/Javax.Net/SocketFactory.xml
@@ -51,7 +51,7 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <summary>Creates a &lt;code&gt;SocketFactory&lt;/code&gt;.</summary>
+        <summary>Creates a <c>SocketFactory</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -158,7 +158,7 @@
         <param name="port">the server port</param>
         <summary>Creates a socket and connects it to the specified port number
             at the specified address.</summary>
-        <returns>the &lt;code&gt;Socket&lt;/code&gt;</returns>
+        <returns>the <c>Socket</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -201,11 +201,11 @@
       </Parameters>
       <Docs>
         <param name="host">the server host name with which to connect, or
-                   &lt;code&gt;null&lt;/code&gt; for the loopback address.</param>
+                   <c>null</c> for the loopback address.</param>
         <param name="port">the server port</param>
         <summary>Creates a socket and connects it to the specified remote host
             at the specified remote port.</summary>
-        <returns>the &lt;code&gt;Socket&lt;/code&gt;</returns>
+        <returns>the <c>Socket</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -257,7 +257,7 @@
         <param name="localPort">the client port</param>
         <summary>Creates a socket and connect it to the specified remote address
             on the specified remote port.</summary>
-        <returns>the &lt;code&gt;Socket&lt;/code&gt;</returns>
+        <returns>the <c>Socket</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -302,13 +302,13 @@
       </Parameters>
       <Docs>
         <param name="host">the server host name with which to connect, or
-                   &lt;code&gt;null&lt;/code&gt; for the loopback address.</param>
+                   <c>null</c> for the loopback address.</param>
         <param name="port">the server port</param>
         <param name="localHost">the local address the socket is bound to</param>
         <param name="localPort">the local port the socket is bound to</param>
         <summary>Creates a socket and connects it to the specified remote host
             on the specified remote port.</summary>
-        <returns>the &lt;code&gt;Socket&lt;/code&gt;</returns>
+        <returns>the <c>Socket</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -349,7 +349,7 @@
       </ReturnValue>
       <Docs>
         <summary>Returns a copy of the environment's default socket factory.</summary>
-        <value>the default &lt;code&gt;SocketFactory&lt;/code&gt;</value>
+        <value>the default <c>SocketFactory</c></value>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Javax.Sql/ConnectionEvent.xml b/docs/Mono.Android/en/Javax.Sql/ConnectionEvent.xml
index 5752f88de1..180295152b 100644
--- a/docs/Mono.Android/en/Javax.Sql/ConnectionEvent.xml
+++ b/docs/Mono.Android/en/Javax.Sql/ConnectionEvent.xml
@@ -31,7 +31,7 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>An &lt;code&gt;Event&lt;/code&gt; object that provides information about the
+    <summary>An <c>Event</c> object that provides information about the
             source of a connection-related event.</summary>
     <remarks>
       <para>
@@ -69,8 +69,8 @@
       </Parameters>
       <Docs>
         <param name="con">the pooled connection that is the source of the event</param>
-        <summary>Constructs a &lt;code&gt;ConnectionEvent&lt;/code&gt; object initialized with
-            the given &lt;code&gt;PooledConnection&lt;/code&gt; object.</summary>
+        <summary>Constructs a <c>ConnectionEvent</c> object initialized with
+            the given <c>PooledConnection</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -109,9 +109,9 @@
       <Docs>
         <param name="con">the pooled connection that is the source of the event</param>
         <param name="ex">the SQLException about to be thrown to the application</param>
-        <summary>Constructs a &lt;code&gt;ConnectionEvent&lt;/code&gt; object initialized with
-            the given &lt;code&gt;PooledConnection&lt;/code&gt; object and
-            &lt;code&gt;SQLException&lt;/code&gt; object.</summary>
+        <summary>Constructs a <c>ConnectionEvent</c> object initialized with
+            the given <c>PooledConnection</c> object and
+            <c>SQLException</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -204,9 +204,9 @@
         <ReturnType>Java.Sql.SQLException</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Retrieves the &lt;code&gt;SQLException&lt;/code&gt; for this
-            &lt;code&gt;ConnectionEvent&lt;/code&gt; object.</summary>
-        <value>the SQLException about to be thrown or &lt;code&gt;null&lt;/code&gt;</value>
+        <summary>Retrieves the <c>SQLException</c> for this
+            <c>ConnectionEvent</c> object.</summary>
+        <value>the SQLException about to be thrown or <c>null</c></value>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Javax.Sql/ICommonDataSource.xml b/docs/Mono.Android/en/Javax.Sql/ICommonDataSource.xml
index 9cb1415f83..ecd51a5e3a 100644
--- a/docs/Mono.Android/en/Javax.Sql/ICommonDataSource.xml
+++ b/docs/Mono.Android/en/Javax.Sql/ICommonDataSource.xml
@@ -25,8 +25,8 @@
     </Attribute>
   </Attributes>
   <Docs since="9">
-    <summary>Interface that defines the methods which are common between &lt;code&gt;DataSource&lt;/code&gt;,
-            &lt;code&gt;XADataSource&lt;/code&gt; and &lt;code&gt;ConnectionPoolDataSource&lt;/code&gt;.</summary>
+    <summary>Interface that defines the methods which are common between <c>DataSource</c>,
+            <c>XADataSource</c> and <c>ConnectionPoolDataSource</c>.</summary>
     <remarks>
       <para>
         <format type="text/html">
diff --git a/docs/Mono.Android/en/Javax.Sql/IConnectionEventListener.xml b/docs/Mono.Android/en/Javax.Sql/IConnectionEventListener.xml
index 915e27f16f..c5101211a5 100644
--- a/docs/Mono.Android/en/Javax.Sql/IConnectionEventListener.xml
+++ b/docs/Mono.Android/en/Javax.Sql/IConnectionEventListener.xml
@@ -29,7 +29,7 @@
   </Attributes>
   <Docs since="1">
     <summary>An object that registers to be notified of events generated by a
-            &lt;code&gt;PooledConnection&lt;/code&gt; object.</summary>
+            <c>PooledConnection</c> object.</summary>
     <remarks>
       <para>
         <format type="text/html">
@@ -71,8 +71,8 @@
         <param name="e">To be added.</param>
         <param name="event">an event object describing the source of
             the event</param>
-        <summary>Notifies this &lt;code&gt;ConnectionEventListener&lt;/code&gt; that
-            the application has called the method &lt;code&gt;close&lt;/code&gt; on its
+        <summary>Notifies this <c>ConnectionEventListener</c> that
+            the application has called the method <c>close</c> on its
             representation of a pooled connection.</summary>
         <remarks>
           <para>
@@ -114,9 +114,9 @@
       <Docs>
         <param name="e">To be added.</param>
         <param name="event">an event object describing the source of
-            the event and containing the &lt;code&gt;SQLException&lt;/code&gt; that the
+            the event and containing the <c>SQLException</c> that the
             driver is about to throw</param>
-        <summary>Notifies this &lt;code&gt;ConnectionEventListener&lt;/code&gt; that
+        <summary>Notifies this <c>ConnectionEventListener</c> that
             a fatal error has occurred and the pooled connection can
             no longer be used.</summary>
         <remarks>
diff --git a/docs/Mono.Android/en/Javax.Sql/IConnectionPoolDataSource.xml b/docs/Mono.Android/en/Javax.Sql/IConnectionPoolDataSource.xml
index 00294c80da..8d56af7d6c 100644
--- a/docs/Mono.Android/en/Javax.Sql/IConnectionPoolDataSource.xml
+++ b/docs/Mono.Android/en/Javax.Sql/IConnectionPoolDataSource.xml
@@ -28,7 +28,7 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>A factory for &lt;code&gt;PooledConnection&lt;/code&gt;
+    <summary>A factory for <c>PooledConnection</c>
             objects.</summary>
     <remarks>
       <para>
@@ -73,9 +73,9 @@
         <param name="password">the user's password</param>
         <summary>Attempts to establish a physical database connection that can
             be used as a pooled connection.</summary>
-        <returns>a &lt;code&gt;PooledConnection&lt;/code&gt; object that is a physical
+        <returns>a <c>PooledConnection</c> object that is a physical
                     connection to the database that this
-                    &lt;code&gt;ConnectionPoolDataSource&lt;/code&gt; object represents</returns>
+                    <c>ConnectionPoolDataSource</c> object represents</returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Javax.Sql/IDataSource.xml b/docs/Mono.Android/en/Javax.Sql/IDataSource.xml
index 4f3a76952f..574d21e989 100644
--- a/docs/Mono.Android/en/Javax.Sql/IDataSource.xml
+++ b/docs/Mono.Android/en/Javax.Sql/IDataSource.xml
@@ -32,7 +32,7 @@
   </Attributes>
   <Docs since="1">
     <summary>A factory for connections to the physical data source that this
-            &lt;code&gt;DataSource&lt;/code&gt; object represents.</summary>
+            <c>DataSource</c> object represents.</summary>
     <remarks>
       <para>
         <format type="text/html">
@@ -106,7 +106,7 @@
              being made</param>
         <param name="password">the user's password</param>
         <summary>Attempts to establish a connection with the data source that
-            this &lt;code&gt;DataSource&lt;/code&gt; object represents.</summary>
+            this <c>DataSource</c> object represents.</summary>
         <returns>a connection to the data source</returns>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Sql/IPooledConnection.xml b/docs/Mono.Android/en/Javax.Sql/IPooledConnection.xml
index 098753f40e..ade4b8474e 100644
--- a/docs/Mono.Android/en/Javax.Sql/IPooledConnection.xml
+++ b/docs/Mono.Android/en/Javax.Sql/IPooledConnection.xml
@@ -66,10 +66,10 @@
       <Docs>
         <param name="listener">a component, usually the connection pool manager,
                    that has implemented the
-                   &lt;code&gt;ConnectionEventListener&lt;/code&gt; interface and wants to be
+                   <c>ConnectionEventListener</c> interface and wants to be
                    notified when the connection is closed or has an error</param>
         <summary>Registers the given event listener so that it will be notified
-            when an event occurs on this &lt;code&gt;PooledConnection&lt;/code&gt; object.</summary>
+            when an event occurs on this <c>PooledConnection</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -108,10 +108,10 @@
         <Parameter Name="listener" Type="Javax.Sql.IStatementEventListener" />
       </Parameters>
       <Docs>
-        <param name="listener">an component which implements the &lt;code&gt;StatementEventListener&lt;/code&gt;
-                                                 interface that is to be registered with this &lt;code&gt;PooledConnection&lt;/code&gt; object
+        <param name="listener">an component which implements the <c>StatementEventListener</c>
+                                                 interface that is to be registered with this <c>PooledConnection</c> object
             &lt;p&gt;</param>
-        <summary>Registers a &lt;code&gt;StatementEventListener&lt;/code&gt; with this &lt;code&gt;PooledConnection&lt;/code&gt; object.</summary>
+        <summary>Registers a <c>StatementEventListener</c> with this <c>PooledConnection</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -148,7 +148,7 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Closes the physical connection that this &lt;code&gt;PooledConnection&lt;/code&gt;
+        <summary>Closes the physical connection that this <c>PooledConnection</c>
             object represents.</summary>
         <remarks>
           <para>
@@ -222,12 +222,12 @@
       <Docs>
         <param name="listener">a component, usually the connection pool manager,
                    that has implemented the
-                   &lt;code&gt;ConnectionEventListener&lt;/code&gt; interface and
-                   been registered with this &lt;code&gt;PooledConnection&lt;/code&gt; object as
+                   <c>ConnectionEventListener</c> interface and
+                   been registered with this <c>PooledConnection</c> object as
                    a listener</param>
         <summary>Removes the given event listener from the list of components that
             will be notified when an event occurs on this
-            &lt;code&gt;PooledConnection&lt;/code&gt; object.</summary>
+            <c>PooledConnection</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -267,12 +267,12 @@
       </Parameters>
       <Docs>
         <param name="listener">the component which implements the
-                                                 &lt;code&gt;StatementEventListener&lt;/code&gt; interface that was previously
-                                                 registered with this &lt;code&gt;PooledConnection&lt;/code&gt; object
+                                                 <c>StatementEventListener</c> interface that was previously
+                                                 registered with this <c>PooledConnection</c> object
             &lt;p&gt;</param>
-        <summary>Removes the specified &lt;code&gt;StatementEventListener&lt;/code&gt; from the list of
+        <summary>Removes the specified <c>StatementEventListener</c> from the list of
             components that will be notified when the driver detects that a
-            &lt;code&gt;PreparedStatement&lt;/code&gt; has been closed or is invalid.</summary>
+            <c>PreparedStatement</c> has been closed or is invalid.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Javax.Sql/IRowSet.xml b/docs/Mono.Android/en/Javax.Sql/IRowSet.xml
index 54ca26a44a..6ee38f4d3d 100644
--- a/docs/Mono.Android/en/Javax.Sql/IRowSet.xml
+++ b/docs/Mono.Android/en/Javax.Sql/IRowSet.xml
@@ -71,11 +71,11 @@
         <Parameter Name="listener" Type="Javax.Sql.IRowSetListener" />
       </Parameters>
       <Docs>
-        <param name="listener">a component that has implemented the &lt;code&gt;RowSetListener&lt;/code&gt;
+        <param name="listener">a component that has implemented the <c>RowSetListener</c>
                    interface and wants to be notified when events occur on this
-                   &lt;code&gt;RowSet&lt;/code&gt; object</param>
+                   <c>RowSet</c> object</param>
         <summary>Registers the given listener so that it will be notified of events
-            that occur on this &lt;code&gt;RowSet&lt;/code&gt; object.</summary>
+            that occur on this <c>RowSet</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -112,7 +112,7 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Clears the parameters set for this &lt;code&gt;RowSet&lt;/code&gt; object's command.</summary>
+        <summary>Clears the parameters set for this <c>RowSet</c> object's command.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -275,7 +275,7 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Fills this &lt;code&gt;RowSet&lt;/code&gt; object with data.</summary>
+        <summary>Fills this <c>RowSet</c> object with data.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -516,9 +516,9 @@
       </Parameters>
       <Docs>
         <param name="listener">a component that has been registered as a listener for this
-                   &lt;code&gt;RowSet&lt;/code&gt; object</param>
+                   <c>RowSet</c> object</param>
         <summary>Removes the specified listener from the list of components that will be
-            notified when an event occurs on this &lt;code&gt;RowSet&lt;/code&gt; object.</summary>
+            notified when an event occurs on this <c>RowSet</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -560,8 +560,8 @@
       <Docs>
         <param name="i">the first parameter is 1, the second is 2, ...</param>
         <param name="x">an object representing an SQL array</param>
-        <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's command
-            with the given  &lt;code&gt;Array&lt;/code&gt; value.</summary>
+        <summary>Sets the designated parameter in this <c>RowSet</c> object's command
+            with the given  <c>Array</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -605,7 +605,7 @@
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
         <param name="x">the Java input stream that contains the ASCII parameter value</param>
-        <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's command
+        <summary>Sets the designated parameter in this <c>RowSet</c> object's command
             to the given input stream.</summary>
         <remarks>
           <para>
@@ -696,8 +696,8 @@
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
         <param name="x">the Java input stream that contains the ASCII parameter value</param>
         <param name="length">the number of bytes in the stream</param>
-        <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's command
-            to the given &lt;code&gt;java.</summary>
+        <summary>Sets the designated parameter in this <c>RowSet</c> object's command
+            to the given <c>java.io.InputStream</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -788,8 +788,8 @@
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
         <param name="x">the parameter value</param>
-        <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's command
-            to the given &lt;code&gt;java.</summary>
+        <summary>Sets the designated parameter in this <c>RowSet</c> object's command
+            to the given <c>java.math.BigDeciaml</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -834,7 +834,7 @@
         <param name="parameterName">the name of the parameter</param>
         <param name="x">the parameter value</param>
         <summary>Sets the designated parameter to the given
-            &lt;code&gt;java.</summary>
+            <c>java.math.BigDecimal</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -878,7 +878,7 @@
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
         <param name="x">the java input stream which contains the binary parameter value</param>
-        <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's command
+        <summary>Sets the designated parameter in this <c>RowSet</c> object's command
             to the given input stream.</summary>
         <remarks>
           <para>
@@ -969,8 +969,8 @@
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
         <param name="x">the java input stream which contains the binary parameter value</param>
         <param name="length">the number of bytes in the stream</param>
-        <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's command
-            to the given &lt;code&gt;java.</summary>
+        <summary>Sets the designated parameter in this <c>RowSet</c> object's command
+            to the given <c>java.io.InputStream</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -1061,8 +1061,8 @@
       <Docs>
         <param name="i">the first parameter is 1, the second is 2, ...</param>
         <param name="x">an object representing a BLOB</param>
-        <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's command
-            with the given  &lt;code&gt;Blob&lt;/code&gt; value.</summary>
+        <summary>Sets the designated parameter in this <c>RowSet</c> object's command
+            with the given  <c>Blob</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -1108,7 +1108,7 @@
             the second is 2, ...</param>
         <param name="inputStream">An object that contains the data to set the parameter
             value to.</param>
-        <summary>Sets the designated parameter to a &lt;code&gt;InputStream&lt;/code&gt; object.</summary>
+        <summary>Sets the designated parameter to a <c>InputStream</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -1151,8 +1151,8 @@
       </Parameters>
       <Docs>
         <param name="parameterName">the name of the parameter</param>
-        <param name="x">a &lt;code&gt;Blob&lt;/code&gt; object that maps an SQL &lt;code&gt;BLOB&lt;/code&gt; value</param>
-        <summary>Sets the designated parameter to the given &lt;code&gt;java.</summary>
+        <param name="x">a <c>Blob</c> object that maps an SQL <c>BLOB</c> value</param>
+        <summary>Sets the designated parameter to the given <c>java.sql.Blob</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -1197,7 +1197,7 @@
         <param name="parameterName">the name of the parameter</param>
         <param name="inputStream">An object that contains the data to set the parameter
             value to.</param>
-        <summary>Sets the designated parameter to a &lt;code&gt;InputStream&lt;/code&gt; object.</summary>
+        <summary>Sets the designated parameter to a <c>InputStream</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -1245,7 +1245,7 @@
         <param name="inputStream">An object that contains the data to set the parameter
             value to.</param>
         <param name="length">the number of bytes in the parameter data.</param>
-        <summary>Sets the designated parameter to a &lt;code&gt;InputStream&lt;/code&gt; object.</summary>
+        <summary>Sets the designated parameter to a <c>InputStream</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -1293,7 +1293,7 @@
         <param name="inputStream">An object that contains the data to set the parameter
             value to.</param>
         <param name="length">the number of bytes in the parameter data.</param>
-        <summary>Sets the designated parameter to a &lt;code&gt;InputStream&lt;/code&gt; object.</summary>
+        <summary>Sets the designated parameter to a <c>InputStream</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -1337,8 +1337,8 @@
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
         <param name="x">the parameter value</param>
-        <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's command
-            to the given Java &lt;code&gt;boolean&lt;/code&gt; value.</summary>
+        <summary>Sets the designated parameter in this <c>RowSet</c> object's command
+            to the given Java <c>boolean</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -1382,7 +1382,7 @@
       <Docs>
         <param name="parameterName">the name of the parameter</param>
         <param name="x">the parameter value</param>
-        <summary>Sets the designated parameter to the given Java &lt;code&gt;boolean&lt;/code&gt; value.</summary>
+        <summary>Sets the designated parameter to the given Java <c>boolean</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -1426,8 +1426,8 @@
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
         <param name="x">the parameter value</param>
-        <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's command
-            to the given Java &lt;code&gt;byte&lt;/code&gt; value.</summary>
+        <summary>Sets the designated parameter in this <c>RowSet</c> object's command
+            to the given Java <c>byte</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -1471,7 +1471,7 @@
       <Docs>
         <param name="parameterName">the name of the parameter</param>
         <param name="x">the parameter value</param>
-        <summary>Sets the designated parameter to the given Java &lt;code&gt;byte&lt;/code&gt; value.</summary>
+        <summary>Sets the designated parameter to the given Java <c>byte</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -1515,8 +1515,8 @@
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
         <param name="x">the parameter value</param>
-        <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's command
-            to the given Java array of &lt;code&gt;byte&lt;/code&gt; values.</summary>
+        <summary>Sets the designated parameter in this <c>RowSet</c> object's command
+            to the given Java array of <c>byte</c> values.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -1603,10 +1603,10 @@
       </Parameters>
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
-        <param name="reader">the &lt;code&gt;java.io.Reader&lt;/code&gt; object that contains the
+        <param name="reader">the <c>java.io.Reader</c> object that contains the
                    Unicode data</param>
-        <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's command
-            to the given &lt;code&gt;Reader&lt;/code&gt;
+        <summary>Sets the designated parameter in this <c>RowSet</c> object's command
+            to the given <c>Reader</c>
             object.</summary>
         <remarks>
           <para>
@@ -1650,9 +1650,9 @@
       </Parameters>
       <Docs>
         <param name="parameterName">the name of the parameter</param>
-        <param name="reader">the &lt;code&gt;java.io.Reader&lt;/code&gt; object that contains the
+        <param name="reader">the <c>java.io.Reader</c> object that contains the
                    Unicode data</param>
-        <summary>Sets the designated parameter to the given &lt;code&gt;Reader&lt;/code&gt;
+        <summary>Sets the designated parameter to the given <c>Reader</c>
             object.</summary>
         <remarks>
           <para>
@@ -1697,11 +1697,11 @@
       </Parameters>
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
-        <param name="reader">the &lt;code&gt;Reader&lt;/code&gt; object that contains the UNICODE data
+        <param name="reader">the <c>Reader</c> object that contains the UNICODE data
                    to be set</param>
         <param name="length">the number of characters in the stream</param>
-        <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's command
-            to the given &lt;code&gt;java.</summary>
+        <summary>Sets the designated parameter in this <c>RowSet</c> object's command
+            to the given <c>java.io.Reader</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -1745,10 +1745,10 @@
       </Parameters>
       <Docs>
         <param name="parameterName">the name of the parameter</param>
-        <param name="reader">the &lt;code&gt;java.io.Reader&lt;/code&gt; object that
+        <param name="reader">the <c>java.io.Reader</c> object that
                    contains the UNICODE data used as the designated parameter</param>
         <param name="length">the number of characters in the stream</param>
-        <summary>Sets the designated parameter to the given &lt;code&gt;Reader&lt;/code&gt;
+        <summary>Sets the designated parameter to the given <c>Reader</c>
             object, which is the given number of characters long.</summary>
         <remarks>
           <para>
@@ -1793,7 +1793,7 @@
       <Docs>
         <param name="parameterIndex">index of the first parameter is 1, the second is 2, ...</param>
         <param name="reader">An object that contains the data to set the parameter value to.</param>
-        <summary>Sets the designated parameter to a &lt;code&gt;Reader&lt;/code&gt; object.</summary>
+        <summary>Sets the designated parameter to a <c>Reader</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -1837,8 +1837,8 @@
       <Docs>
         <param name="i">the first parameter is 1, the second is 2, ...</param>
         <param name="x">an object representing a CLOB</param>
-        <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's command
-            with the given  &lt;code&gt;Clob&lt;/code&gt; value.</summary>
+        <summary>Sets the designated parameter in this <c>RowSet</c> object's command
+            with the given  <c>Clob</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -1882,7 +1882,7 @@
       <Docs>
         <param name="parameterName">the name of the parameter</param>
         <param name="reader">An object that contains the data to set the parameter value to.</param>
-        <summary>Sets the designated parameter to a &lt;code&gt;Reader&lt;/code&gt; object.</summary>
+        <summary>Sets the designated parameter to a <c>Reader</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -1925,8 +1925,8 @@
       </Parameters>
       <Docs>
         <param name="parameterName">the name of the parameter</param>
-        <param name="x">a &lt;code&gt;Clob&lt;/code&gt; object that maps an SQL &lt;code&gt;CLOB&lt;/code&gt; value</param>
-        <summary>Sets the designated parameter to the given &lt;code&gt;java.</summary>
+        <param name="x">a <c>Clob</c> object that maps an SQL <c>CLOB</c> value</param>
+        <summary>Sets the designated parameter to the given <c>java.sql.Clob</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -1972,7 +1972,7 @@
         <param name="parameterIndex">index of the first parameter is 1, the second is 2, ...</param>
         <param name="reader">An object that contains the data to set the parameter value to.</param>
         <param name="length">the number of characters in the parameter data.</param>
-        <summary>Sets the designated parameter to a &lt;code&gt;Reader&lt;/code&gt; object.</summary>
+        <summary>Sets the designated parameter to a <c>Reader</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -2018,7 +2018,7 @@
         <param name="parameterName">the name of the parameter to be set</param>
         <param name="reader">An object that contains the data to set the parameter value to.</param>
         <param name="length">the number of characters in the parameter data.</param>
-        <summary>Sets the designated parameter to a &lt;code&gt;Reader&lt;/code&gt; object.</summary>
+        <summary>Sets the designated parameter to a <c>Reader</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -2059,10 +2059,10 @@
         <Parameter Name="concurrency" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="concurrency">one of the &lt;code&gt;ResultSet&lt;/code&gt; constants specifying a
-                   concurrency level:  &lt;code&gt;ResultSet.CONCUR_READ_ONLY&lt;/code&gt; or
-                   &lt;code&gt;ResultSet.CONCUR_UPDATABLE&lt;/code&gt;</param>
-        <summary>Sets the concurrency of this &lt;code&gt;RowSet&lt;/code&gt; object to the given
+        <param name="concurrency">one of the <c>ResultSet</c> constants specifying a
+                   concurrency level:  <c>ResultSet.CONCUR_READ_ONLY</c> or
+                   <c>ResultSet.CONCUR_UPDATABLE</c></param>
+        <summary>Sets the concurrency of this <c>RowSet</c> object to the given
             concurrency level.</summary>
         <remarks>
           <para>
@@ -2107,8 +2107,8 @@
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
         <param name="x">the parameter value</param>
-        <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's command
-            to the given &lt;code&gt;java.</summary>
+        <summary>Sets the designated parameter in this <c>RowSet</c> object's command
+            to the given <c>java.sql.Date</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -2152,7 +2152,9 @@
       <Docs>
         <param name="parameterName">the name of the parameter</param>
         <param name="x">the parameter value</param>
-        <summary>Sets the designated parameter to the given &lt;code&gt;java.</summary>
+        <summary>Sets the designated parameter to the given <c>java.sql.Date</c> value
+            using the default time zone of the virtual machine that is running
+            the application.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -2197,9 +2199,9 @@
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
         <param name="x">the parameter value</param>
-        <param name="cal">the &lt;code&gt;java.util.Calendar&lt;/code&gt; object to use for calculating the date</param>
-        <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's command
-            with the given  &lt;code&gt;java.</summary>
+        <param name="cal">the <c>java.util.Calendar</c> object to use for calculating the date</param>
+        <summary>Sets the designated parameter in this <c>RowSet</c> object's command
+            with the given  <c>java.sql.Date</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -2244,9 +2246,10 @@
       <Docs>
         <param name="parameterName">the name of the parameter</param>
         <param name="x">the parameter value</param>
-        <param name="cal">the &lt;code&gt;Calendar&lt;/code&gt; object the driver will use
+        <param name="cal">the <c>Calendar</c> object the driver will use
                        to construct the date</param>
-        <summary>Sets the designated parameter to the given &lt;code&gt;java.</summary>
+        <summary>Sets the designated parameter to the given <c>java.sql.Date</c> value,
+            using the given <c>Calendar</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -2290,8 +2293,8 @@
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
         <param name="x">the parameter value</param>
-        <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's command
-            to the given Java &lt;code&gt;double&lt;/code&gt; value.</summary>
+        <summary>Sets the designated parameter in this <c>RowSet</c> object's command
+            to the given Java <c>double</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -2335,7 +2338,7 @@
       <Docs>
         <param name="parameterName">the name of the parameter</param>
         <param name="x">the parameter value</param>
-        <summary>Sets the designated parameter to the given Java &lt;code&gt;double&lt;/code&gt; value.</summary>
+        <summary>Sets the designated parameter to the given Java <c>double</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -2379,8 +2382,8 @@
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
         <param name="x">the parameter value</param>
-        <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's command
-            to the given Java &lt;code&gt;float&lt;/code&gt; value.</summary>
+        <summary>Sets the designated parameter in this <c>RowSet</c> object's command
+            to the given Java <c>float</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -2424,7 +2427,7 @@
       <Docs>
         <param name="parameterName">the name of the parameter</param>
         <param name="x">the parameter value</param>
-        <summary>Sets the designated parameter to the given Java &lt;code&gt;float&lt;/code&gt; value.</summary>
+        <summary>Sets the designated parameter to the given Java <c>float</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -2468,8 +2471,8 @@
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
         <param name="x">the parameter value</param>
-        <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's command
-            to the given Java &lt;code&gt;int&lt;/code&gt; value.</summary>
+        <summary>Sets the designated parameter in this <c>RowSet</c> object's command
+            to the given Java <c>int</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -2513,7 +2516,7 @@
       <Docs>
         <param name="parameterName">the name of the parameter</param>
         <param name="x">the parameter value</param>
-        <summary>Sets the designated parameter to the given Java &lt;code&gt;int&lt;/code&gt; value.</summary>
+        <summary>Sets the designated parameter to the given Java <c>int</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -2557,8 +2560,8 @@
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
         <param name="x">the parameter value</param>
-        <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's command
-            to the given Java &lt;code&gt;long&lt;/code&gt; value.</summary>
+        <summary>Sets the designated parameter in this <c>RowSet</c> object's command
+            to the given Java <c>long</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -2602,7 +2605,7 @@
       <Docs>
         <param name="parameterName">the name of the parameter</param>
         <param name="x">the parameter value</param>
-        <summary>Sets the designated parameter to the given Java &lt;code&gt;long&lt;/code&gt; value.</summary>
+        <summary>Sets the designated parameter to the given Java <c>long</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -2646,8 +2649,8 @@
       <Docs>
         <param name="parameterIndex">of the first parameter is 1, the second is 2, ...</param>
         <param name="value">the parameter value</param>
-        <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's command
-            to a &lt;code&gt;Reader&lt;/code&gt; object.</summary>
+        <summary>Sets the designated parameter in this <c>RowSet</c> object's command
+            to a <c>Reader</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -2691,7 +2694,7 @@
       <Docs>
         <param name="parameterName">the name of the parameter</param>
         <param name="value">the parameter value</param>
-        <summary>Sets the designated parameter to a &lt;code&gt;Reader&lt;/code&gt; object.</summary>
+        <summary>Sets the designated parameter to a <c>Reader</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -2737,7 +2740,7 @@
         <param name="parameterIndex">of the first parameter is 1, the second is 2, ...</param>
         <param name="value">the parameter value</param>
         <param name="length">the number of characters in the parameter data.</param>
-        <summary>Sets the designated parameter to a &lt;code&gt;Reader&lt;/code&gt; object.</summary>
+        <summary>Sets the designated parameter to a <c>Reader</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -2783,7 +2786,7 @@
         <param name="parameterName">the name of the column to be set</param>
         <param name="value">the parameter value</param>
         <param name="length">the number of characters in the parameter data.</param>
-        <summary>Sets the designated parameter to a &lt;code&gt;Reader&lt;/code&gt; object.</summary>
+        <summary>Sets the designated parameter to a <c>Reader</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -2827,7 +2830,7 @@
       <Docs>
         <param name="parameterIndex">index of the first parameter is 1, the second is 2, ...</param>
         <param name="reader">An object that contains the data to set the parameter value to.</param>
-        <summary>Sets the designated parameter to a &lt;code&gt;Reader&lt;/code&gt; object.</summary>
+        <summary>Sets the designated parameter to a <c>Reader</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -2871,7 +2874,7 @@
       <Docs>
         <param name="parameterIndex">of the first parameter is 1, the second is 2, ...</param>
         <param name="value">the parameter value</param>
-        <summary>Sets the designated parameter to a &lt;code&gt;java.</summary>
+        <summary>Sets the designated parameter to a <c>java.sql.NClob</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -2915,7 +2918,7 @@
       <Docs>
         <param name="parameterName">the name of the parameter</param>
         <param name="reader">An object that contains the data to set the parameter value to.</param>
-        <summary>Sets the designated parameter to a &lt;code&gt;Reader&lt;/code&gt; object.</summary>
+        <summary>Sets the designated parameter to a <c>Reader</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -2959,7 +2962,7 @@
       <Docs>
         <param name="parameterName">the name of the column to be set</param>
         <param name="value">the parameter value</param>
-        <summary>Sets the designated parameter to a &lt;code&gt;java.</summary>
+        <summary>Sets the designated parameter to a <c>java.sql.NClob</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -3005,7 +3008,7 @@
         <param name="parameterIndex">index of the first parameter is 1, the second is 2, ...</param>
         <param name="reader">An object that contains the data to set the parameter value to.</param>
         <param name="length">the number of characters in the parameter data.</param>
-        <summary>Sets the designated parameter to a &lt;code&gt;Reader&lt;/code&gt; object.</summary>
+        <summary>Sets the designated parameter to a <c>Reader</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -3051,7 +3054,7 @@
         <param name="parameterName">the name of the parameter to be set</param>
         <param name="reader">An object that contains the data to set the parameter value to.</param>
         <param name="length">the number of characters in the parameter data.</param>
-        <summary>Sets the designated parameter to a &lt;code&gt;Reader&lt;/code&gt; object.</summary>
+        <summary>Sets the designated parameter to a <c>Reader</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -3095,7 +3098,7 @@
       <Docs>
         <param name="parameterIndex">of the first parameter is 1, the second is 2, ...</param>
         <param name="value">the parameter value</param>
-        <summary>Sets the designated paramter to the given &lt;code&gt;String&lt;/code&gt; object.</summary>
+        <summary>Sets the designated paramter to the given <c>String</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -3139,7 +3142,7 @@
       <Docs>
         <param name="parameterName">the name of the column to be set</param>
         <param name="value">the parameter value</param>
-        <summary>Sets the designated paramter to the given &lt;code&gt;String&lt;/code&gt; object.</summary>
+        <summary>Sets the designated paramter to the given <c>String</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -3182,9 +3185,9 @@
       </Parameters>
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
-        <param name="sqlType">a SQL type code defined by &lt;code&gt;java.sql.Types&lt;/code&gt;</param>
-        <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's SQL
-            command to SQL &lt;code&gt;NULL&lt;/code&gt;.</summary>
+        <param name="sqlType">a SQL type code defined by <c>java.sql.Types</c></param>
+        <summary>Sets the designated parameter in this <c>RowSet</c> object's SQL
+            command to SQL <c>NULL</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -3227,8 +3230,8 @@
       </Parameters>
       <Docs>
         <param name="parameterName">the name of the parameter</param>
-        <param name="sqlType">the SQL type code defined in &lt;code&gt;java.sql.Types&lt;/code&gt;</param>
-        <summary>Sets the designated parameter to SQL &lt;code&gt;NULL&lt;/code&gt;.</summary>
+        <param name="sqlType">the SQL type code defined in <c>java.sql.Types</c></param>
+        <summary>Sets the designated parameter to SQL <c>NULL</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -3272,12 +3275,12 @@
       </Parameters>
       <Docs>
         <param name="paramIndex">the first parameter is 1, the second is 2, ...</param>
-        <param name="sqlType">a value from &lt;code&gt;java.sql.Types&lt;/code&gt;</param>
+        <param name="sqlType">a value from <c>java.sql.Types</c></param>
         <param name="typeName">the fully qualified name of an SQL UDT or the type
-                   name of the SQL structured type being referenced by a &lt;code&gt;REF&lt;/code&gt;
-                   type; ignored if the parameter is not a UDT or &lt;code&gt;REF&lt;/code&gt; type</param>
-        <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's SQL
-            command to SQL &lt;code&gt;NULL&lt;/code&gt;.</summary>
+                   name of the SQL structured type being referenced by a <c>REF</c>
+                   type; ignored if the parameter is not a UDT or <c>REF</c> type</param>
+        <summary>Sets the designated parameter in this <c>RowSet</c> object's SQL
+            command to SQL <c>NULL</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -3321,11 +3324,11 @@
       </Parameters>
       <Docs>
         <param name="parameterName">the name of the parameter</param>
-        <param name="sqlType">a value from &lt;code&gt;java.sql.Types&lt;/code&gt;</param>
+        <param name="sqlType">a value from <c>java.sql.Types</c></param>
         <param name="typeName">the fully-qualified name of an SQL user-defined type;
                    ignored if the parameter is not a user-defined type or
-                   SQL &lt;code&gt;REF&lt;/code&gt; value</param>
-        <summary>Sets the designated parameter to SQL &lt;code&gt;NULL&lt;/code&gt;.</summary>
+                   SQL <c>REF</c> value</param>
+        <summary>Sets the designated parameter to SQL <c>NULL</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -3369,8 +3372,8 @@
       <Docs>
         <param name="parameterIndex">The first parameter is 1, the second is 2, ...</param>
         <param name="x">The object containing the input parameter value</param>
-        <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's command
-            with a Java &lt;code&gt;Object&lt;/code&gt;.</summary>
+        <summary>Sets the designated parameter in this <c>RowSet</c> object's command
+            with a Java <c>Object</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -3459,10 +3462,10 @@
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
         <param name="x">the object containing the input parameter value</param>
-        <param name="targetSqlType">the SQL type (as defined in &lt;code&gt;java.sql.Types&lt;/code&gt;)
+        <param name="targetSqlType">the SQL type (as defined in <c>java.sql.Types</c>)
                    to be sent to the database</param>
-        <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's command
-            with a Java &lt;code&gt;Object&lt;/code&gt;.</summary>
+        <summary>Sets the designated parameter in this <c>RowSet</c> object's command
+            with a Java <c>Object</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -3555,18 +3558,18 @@
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
         <param name="x">the object containing the input parameter value</param>
-        <param name="targetSqlType">the SQL type (as defined in &lt;code&gt;java.sql.Types&lt;/code&gt;)
+        <param name="targetSqlType">the SQL type (as defined in <c>java.sql.Types</c>)
                    to be sent to the database. The scale argument may further qualify this
                    type.</param>
-        <param name="scaleOrLength">for &lt;code&gt;java.sql.Types.DECIMAL&lt;/code&gt;
-                     or &lt;code&gt;java.sql.Types.NUMERIC types&lt;/code&gt;,
+        <param name="scaleOrLength">for <c>java.sql.Types.DECIMAL</c>
+                     or <c>java.sql.Types.NUMERIC types</c>,
                      this is the number of digits after the decimal point. For
-                     Java Object types &lt;code&gt;InputStream&lt;/code&gt; and &lt;code&gt;Reader&lt;/code&gt;,
+                     Java Object types <c>InputStream</c> and <c>Reader</c>,
                      this is the length
                      of the data in the stream or reader.  For all other types,
                      this value will be ignored.</param>
-        <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's command
-            with the given Java &lt;code&gt;Object&lt;/code&gt;.</summary>
+        <summary>Sets the designated parameter in this <c>RowSet</c> object's command
+            with the given Java <c>Object</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -3660,9 +3663,9 @@
       </Parameters>
       <Docs>
         <param name="i">the first parameter is 1, the second is 2, ...</param>
-        <param name="x">an object representing data of an SQL &lt;code&gt;REF&lt;/code&gt; type</param>
-        <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's command
-            with the given  &lt;code&gt;Ref&lt;/code&gt; value.</summary>
+        <param name="x">an object representing data of an SQL <c>REF</c> type</param>
+        <summary>Sets the designated parameter in this <c>RowSet</c> object's command
+            with the given  <c>Ref</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -3706,7 +3709,7 @@
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
         <param name="x">the parameter value</param>
-        <summary>Sets the designated parameter to the given &lt;code&gt;java.</summary>
+        <summary>Sets the designated parameter to the given <c>java.sql.RowId</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -3750,7 +3753,7 @@
       <Docs>
         <param name="parameterName">the name of the parameter</param>
         <param name="x">the parameter value</param>
-        <summary>Sets the designated parameter to the given &lt;code&gt;java.</summary>
+        <summary>Sets the designated parameter to the given <c>java.sql.RowId</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -3794,8 +3797,8 @@
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
         <param name="x">the parameter value</param>
-        <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's command
-            to the given Java &lt;code&gt;short&lt;/code&gt; value.</summary>
+        <summary>Sets the designated parameter in this <c>RowSet</c> object's command
+            to the given Java <c>short</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -3839,7 +3842,7 @@
       <Docs>
         <param name="parameterName">the name of the parameter</param>
         <param name="x">the parameter value</param>
-        <summary>Sets the designated parameter to the given Java &lt;code&gt;short&lt;/code&gt; value.</summary>
+        <summary>Sets the designated parameter to the given Java <c>short</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -3882,8 +3885,8 @@
       </Parameters>
       <Docs>
         <param name="parameterIndex">index of the first parameter is 1, the second is 2, ...</param>
-        <param name="xmlObject">a &lt;code&gt;SQLXML&lt;/code&gt; object that maps an SQL &lt;code&gt;XML&lt;/code&gt; value</param>
-        <summary>Sets the designated parameter to the given &lt;code&gt;java.</summary>
+        <param name="xmlObject">a <c>SQLXML</c> object that maps an SQL <c>XML</c> value</param>
+        <summary>Sets the designated parameter to the given <c>java.sql.SQLXML</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -3926,8 +3929,8 @@
       </Parameters>
       <Docs>
         <param name="parameterName">the name of the parameter</param>
-        <param name="xmlObject">a &lt;code&gt;SQLXML&lt;/code&gt; object that maps an &lt;code&gt;SQL XML&lt;/code&gt; value</param>
-        <summary>Sets the designated parameter to the given &lt;code&gt;java.</summary>
+        <param name="xmlObject">a <c>SQLXML</c> object that maps an <c>SQL XML</c> value</param>
+        <summary>Sets the designated parameter to the given <c>java.sql.SQLXML</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -3971,8 +3974,8 @@
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
         <param name="x">the parameter value</param>
-        <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's command
-            to the given Java &lt;code&gt;String&lt;/code&gt; value.</summary>
+        <summary>Sets the designated parameter in this <c>RowSet</c> object's command
+            to the given Java <c>String</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -4016,7 +4019,7 @@
       <Docs>
         <param name="parameterName">the name of the parameter</param>
         <param name="x">the parameter value</param>
-        <summary>Sets the designated parameter to the given Java &lt;code&gt;String&lt;/code&gt; value.</summary>
+        <summary>Sets the designated parameter to the given Java <c>String</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -4060,8 +4063,8 @@
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
         <param name="x">the parameter value</param>
-        <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's command
-            to the given &lt;code&gt;java.</summary>
+        <summary>Sets the designated parameter in this <c>RowSet</c> object's command
+            to the given <c>java.sql.Time</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -4106,7 +4109,7 @@
       <Docs>
         <param name="parameterName">the name of the parameter</param>
         <param name="x">the parameter value</param>
-        <summary>Sets the designated parameter to the given &lt;code&gt;java.</summary>
+        <summary>Sets the designated parameter to the given <c>java.sql.Time</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -4151,9 +4154,9 @@
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
         <param name="x">the parameter value</param>
-        <param name="cal">the &lt;code&gt;java.util.Calendar&lt;/code&gt; object to use for calculating the time</param>
-        <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's command
-            with the given  &lt;code&gt;java.</summary>
+        <param name="cal">the <c>java.util.Calendar</c> object to use for calculating the time</param>
+        <summary>Sets the designated parameter in this <c>RowSet</c> object's command
+            with the given  <c>java.sql.Time</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -4199,9 +4202,10 @@
       <Docs>
         <param name="parameterName">the name of the parameter</param>
         <param name="x">the parameter value</param>
-        <param name="cal">the &lt;code&gt;Calendar&lt;/code&gt; object the driver will use
+        <param name="cal">the <c>Calendar</c> object the driver will use
                        to construct the time</param>
-        <summary>Sets the designated parameter to the given &lt;code&gt;java.</summary>
+        <summary>Sets the designated parameter to the given <c>java.sql.Time</c> value,
+            using the given <c>Calendar</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -4245,8 +4249,8 @@
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
         <param name="x">the parameter value</param>
-        <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's command
-            to the given &lt;code&gt;java.</summary>
+        <summary>Sets the designated parameter in this <c>RowSet</c> object's command
+            to the given <c>java.sql.Timestamp</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -4291,7 +4295,7 @@
       <Docs>
         <param name="parameterName">the name of the parameter</param>
         <param name="x">the parameter value</param>
-        <summary>Sets the designated parameter to the given &lt;code&gt;java.</summary>
+        <summary>Sets the designated parameter to the given <c>java.sql.Timestamp</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -4336,10 +4340,10 @@
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
         <param name="x">the parameter value</param>
-        <param name="cal">the &lt;code&gt;java.util.Calendar&lt;/code&gt; object to use for calculating the
+        <param name="cal">the <c>java.util.Calendar</c> object to use for calculating the
                    timestamp</param>
-        <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's command
-            with the given  &lt;code&gt;java.</summary>
+        <summary>Sets the designated parameter in this <c>RowSet</c> object's command
+            with the given  <c>java.sql.Timestamp</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -4385,9 +4389,10 @@
       <Docs>
         <param name="parameterName">the name of the parameter</param>
         <param name="x">the parameter value</param>
-        <param name="cal">the &lt;code&gt;Calendar&lt;/code&gt; object the driver will use
+        <param name="cal">the <c>Calendar</c> object the driver will use
                        to construct the timestamp</param>
-        <summary>Sets the designated parameter to the given &lt;code&gt;java.</summary>
+        <summary>Sets the designated parameter to the given <c>java.sql.Timestamp</c> value,
+            using the given <c>Calendar</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -4428,11 +4433,11 @@
         <Parameter Name="type" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="type">one of the &lt;code&gt;ResultSet&lt;/code&gt; constants specifying a type:
-                   &lt;code&gt;ResultSet.TYPE_FORWARD_ONLY&lt;/code&gt;,
-                   &lt;code&gt;ResultSet.TYPE_SCROLL_INSENSITIVE&lt;/code&gt;, or
-                   &lt;code&gt;ResultSet.TYPE_SCROLL_SENSITIVE&lt;/code&gt;</param>
-        <summary>Sets the type of this &lt;code&gt;RowSet&lt;/code&gt; object to the given type.</summary>
+        <param name="type">one of the <c>ResultSet</c> constants specifying a type:
+                   <c>ResultSet.TYPE_FORWARD_ONLY</c>,
+                   <c>ResultSet.TYPE_SCROLL_INSENSITIVE</c>, or
+                   <c>ResultSet.TYPE_SCROLL_SENSITIVE</c></param>
+        <summary>Sets the type of this <c>RowSet</c> object to the given type.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -4475,8 +4480,8 @@
       </Parameters>
       <Docs>
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
-        <param name="x">the &lt;code&gt;java.net.URL&lt;/code&gt; object to be set</param>
-        <summary>Sets the designated parameter to the given &lt;code&gt;java.</summary>
+        <param name="x">the <c>java.net.URL</c> object to be set</param>
+        <summary>Sets the designated parameter to the given <c>java.net.URL</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Javax.Sql/IRowSetInternal.xml b/docs/Mono.Android/en/Javax.Sql/IRowSetInternal.xml
index dd6582483d..75304a898a 100644
--- a/docs/Mono.Android/en/Javax.Sql/IRowSetInternal.xml
+++ b/docs/Mono.Android/en/Javax.Sql/IRowSetInternal.xml
@@ -25,8 +25,8 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>The interface that a &lt;code&gt;RowSet&lt;/code&gt; object implements in order to
-            present itself to a &lt;code&gt;RowSetReader&lt;/code&gt; or &lt;code&gt;RowSetWriter&lt;/code&gt;
+    <summary>The interface that a <c>RowSet</c> object implements in order to
+            present itself to a <c>RowSetReader</c> or <c>RowSetWriter</c>
             object.</summary>
     <remarks>
       <para>
@@ -95,8 +95,8 @@
       <Parameters />
       <Docs>
         <summary>Retrieves the parameters that have been set for this
-            &lt;code&gt;RowSet&lt;/code&gt; object's command.</summary>
-        <returns>an array of the current parameter values for this &lt;code&gt;RowSet&lt;/code&gt;
+            <c>RowSet</c> object's command.</summary>
+        <returns>an array of the current parameter values for this <c>RowSet</c>
                     object's command</returns>
         <remarks>
           <para>
@@ -201,10 +201,10 @@
         <Parameter Name="md" Type="Javax.Sql.IRowSetMetaData" />
       </Parameters>
       <Docs>
-        <param name="md">the &lt;code&gt;RowSetMetaData&lt;/code&gt; object that will be set with
+        <param name="md">the <c>RowSetMetaData</c> object that will be set with
                    information about the rowset's columns</param>
-        <summary>Sets the given &lt;code&gt;RowSetMetaData&lt;/code&gt; object as the
-            &lt;code&gt;RowSetMetaData&lt;/code&gt; object for this &lt;code&gt;RowSet&lt;/code&gt;
+        <summary>Sets the given <c>RowSetMetaData</c> object as the
+            <c>RowSetMetaData</c> object for this <c>RowSet</c>
             object.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Sql/IRowSetListener.xml b/docs/Mono.Android/en/Javax.Sql/IRowSetListener.xml
index 9c74a44b16..bc99d28b06 100644
--- a/docs/Mono.Android/en/Javax.Sql/IRowSetListener.xml
+++ b/docs/Mono.Android/en/Javax.Sql/IRowSetListener.xml
@@ -30,7 +30,7 @@
   <Docs since="1">
     <summary>An interface that must be implemented by a
             component that wants to be notified when a significant
-            event happens in the life of a &lt;code&gt;RowSet&lt;/code&gt; object.</summary>
+            event happens in the life of a <c>RowSet</c> object.</summary>
     <remarks>
       <para>
         <format type="text/html">
@@ -70,9 +70,9 @@
       </Parameters>
       <Docs>
         <param name="e">To be added.</param>
-        <param name="event">a &lt;code&gt;RowSetEvent&lt;/code&gt; object that contains
-                    the &lt;code&gt;RowSet&lt;/code&gt; object that is the source of the event</param>
-        <summary>Notifies registered listeners that a &lt;code&gt;RowSet&lt;/code&gt; object's
+        <param name="event">a <c>RowSetEvent</c> object that contains
+                    the <c>RowSet</c> object that is the source of the event</param>
+        <summary>Notifies registered listeners that a <c>RowSet</c> object's
             cursor has moved.</summary>
         <remarks>
           <para>
@@ -113,9 +113,9 @@
       </Parameters>
       <Docs>
         <param name="e">To be added.</param>
-        <param name="event">a &lt;code&gt;RowSetEvent&lt;/code&gt; object that contains
-                    the &lt;code&gt;RowSet&lt;/code&gt; object that is the source of the event</param>
-        <summary>Notifies registered listeners that a &lt;code&gt;RowSet&lt;/code&gt; object
+        <param name="event">a <c>RowSetEvent</c> object that contains
+                    the <c>RowSet</c> object that is the source of the event</param>
+        <summary>Notifies registered listeners that a <c>RowSet</c> object
             has had a change in one of its rows.</summary>
         <remarks>
           <para>
@@ -156,10 +156,10 @@
       </Parameters>
       <Docs>
         <param name="e">To be added.</param>
-        <param name="event">a &lt;code&gt;RowSetEvent&lt;/code&gt; object that contains
-                    the &lt;code&gt;RowSet&lt;/code&gt; object that is the source of the event</param>
-        <summary>Notifies registered listeners that a &lt;code&gt;RowSet&lt;/code&gt; object
-            in the given &lt;code&gt;RowSetEvent&lt;/code&gt; object has changed its entire contents.</summary>
+        <param name="event">a <c>RowSetEvent</c> object that contains
+                    the <c>RowSet</c> object that is the source of the event</param>
+        <summary>Notifies registered listeners that a <c>RowSet</c> object
+            in the given <c>RowSetEvent</c> object has changed its entire contents.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Javax.Sql/IRowSetMetaData.xml b/docs/Mono.Android/en/Javax.Sql/IRowSetMetaData.xml
index 4e3be7665a..3d30c7183b 100644
--- a/docs/Mono.Android/en/Javax.Sql/IRowSetMetaData.xml
+++ b/docs/Mono.Android/en/Javax.Sql/IRowSetMetaData.xml
@@ -32,7 +32,7 @@
   </Attributes>
   <Docs since="1">
     <summary>An object that contains information about the columns in a
-            &lt;code&gt;RowSet&lt;/code&gt; object.</summary>
+            <c>RowSet</c> object.</summary>
     <remarks>
       <para>
         <format type="text/html">
@@ -73,10 +73,11 @@
       </Parameters>
       <Docs>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
-        <param name="property">&lt;code&gt;true&lt;/code&gt; if the column is automatically
-                            numbered; &lt;code&gt;false&lt;/code&gt; if it is not</param>
+        <param name="property">
+          <c>true</c> if the column is automatically
+                            numbered; <c>false</c> if it is not</param>
         <summary>Sets whether the designated column is automatically numbered,
-            The default is for a &lt;code&gt;RowSet&lt;/code&gt; object's
+            The default is for a <c>RowSet</c> object's
             columns not to be automatically numbered.</summary>
         <remarks>
           <para>
@@ -120,8 +121,9 @@
       </Parameters>
       <Docs>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
-        <param name="property">&lt;code&gt;true&lt;/code&gt; if the column is case sensitive;
-                            &lt;code&gt;false&lt;/code&gt; if it is not</param>
+        <param name="property">
+          <c>true</c> if the column is case sensitive;
+                            <c>false</c> if it is not</param>
         <summary>Sets whether the designated column is case sensitive.</summary>
         <remarks>
           <para>
@@ -167,7 +169,7 @@
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
         <param name="catalogName">the column's catalog name</param>
         <summary>Sets the designated column's table's catalog name, if any, to the given
-            &lt;code&gt;String&lt;/code&gt;.</summary>
+            <c>String</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -208,8 +210,8 @@
         <Parameter Name="columnCount" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="columnCount">the number of columns in the &lt;code&gt;RowSet&lt;/code&gt; object</param>
-        <summary>Sets the number of columns in the &lt;code&gt;RowSet&lt;/code&gt; object to
+        <param name="columnCount">the number of columns in the <c>RowSet</c> object</param>
+        <summary>Sets the number of columns in the <c>RowSet</c> object to
             the given number.</summary>
         <remarks>
           <para>
@@ -256,7 +258,7 @@
         <param name="size">the normal maximum number of characters for
                       the designated column</param>
         <summary>Sets the designated column's normal maximum width in chars to the
-            given &lt;code&gt;int&lt;/code&gt;.</summary>
+            given <c>int</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -301,7 +303,7 @@
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
         <param name="label">the column title</param>
         <summary>Sets the suggested column title for use in printouts and
-            displays, if any, to the given &lt;code&gt;String&lt;/code&gt;.</summary>
+            displays, if any, to the given <c>String</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -345,7 +347,7 @@
       <Docs>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
         <param name="columnName">the designated column's name</param>
-        <summary>Sets the name of the designated column to the given &lt;code&gt;String&lt;/code&gt;.</summary>
+        <summary>Sets the name of the designated column to the given <c>String</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -434,7 +436,7 @@
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
         <param name="typeName">data source specific type name.</param>
         <summary>Sets the designated column's type name that is specific to the
-            data source, if any, to the given &lt;code&gt;String&lt;/code&gt;.</summary>
+            data source, if any, to the given <c>String</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -477,8 +479,9 @@
       </Parameters>
       <Docs>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
-        <param name="property">&lt;code&gt;true&lt;/code&gt; if the column is a cash value;
-                            &lt;code&gt;false&lt;/code&gt; if it is not</param>
+        <param name="property">
+          <c>true</c> if the column is a cash value;
+                            <c>false</c> if it is not</param>
         <summary>Sets whether the designated column is a cash value.</summary>
         <remarks>
           <para>
@@ -523,11 +526,11 @@
       <Docs>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
         <param name="property">one of the following constants:
-                            &lt;code&gt;ResultSetMetaData.columnNoNulls&lt;/code&gt;,
-                            &lt;code&gt;ResultSetMetaData.columnNullable&lt;/code&gt;, or
-                            &lt;code&gt;ResultSetMetaData.columnNullableUnknown&lt;/code&gt;</param>
+                            <c>ResultSetMetaData.columnNoNulls</c>,
+                            <c>ResultSetMetaData.columnNullable</c>, or
+                            <c>ResultSetMetaData.columnNullableUnknown</c></param>
         <summary>Sets whether the designated column's value can be set to
-            &lt;code&gt;NULL&lt;/code&gt;.</summary>
+            <c>NULL</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -572,7 +575,7 @@
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
         <param name="precision">the total number of decimal digits</param>
         <summary>Sets the designated column's number of decimal digits to the
-            given &lt;code&gt;int&lt;/code&gt;.</summary>
+            given <c>int</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -617,7 +620,7 @@
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
         <param name="scale">the number of digits to right of decimal point</param>
         <summary>Sets the designated column's number of digits to the
-            right of the decimal point to the given &lt;code&gt;int&lt;/code&gt;.</summary>
+            right of the decimal point to the given <c>int</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -662,7 +665,7 @@
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
         <param name="schemaName">the schema name</param>
         <summary>Sets the name of the designated column's table's schema, if any, to
-            the given &lt;code&gt;String&lt;/code&gt;.</summary>
+            the given <c>String</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -705,8 +708,9 @@
       </Parameters>
       <Docs>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
-        <param name="property">&lt;code&gt;true&lt;/code&gt; if the column can be used in a
-                            &lt;code&gt;WHERE&lt;/code&gt; clause; &lt;code&gt;false&lt;/code&gt; if it cannot</param>
+        <param name="property">
+          <c>true</c> if the column can be used in a
+                            <c>WHERE</c> clause; <c>false</c> if it cannot</param>
         <summary>Sets whether the designated column can be used in a where clause.</summary>
         <remarks>
           <para>
@@ -750,8 +754,9 @@
       </Parameters>
       <Docs>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
-        <param name="property">&lt;code&gt;true&lt;/code&gt; if the column is a signed number;
-                            &lt;code&gt;false&lt;/code&gt; if it is not</param>
+        <param name="property">
+          <c>true</c> if the column is a signed number;
+                            <c>false</c> if it is not</param>
         <summary>Sets whether the designated column is a signed number.</summary>
         <remarks>
           <para>
@@ -797,7 +802,7 @@
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
         <param name="tableName">the column's table name</param>
         <summary>Sets the designated column's table name, if any, to the given
-            &lt;code&gt;String&lt;/code&gt;.</summary>
+            <c>String</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Javax.Sql/IRowSetReader.xml b/docs/Mono.Android/en/Javax.Sql/IRowSetReader.xml
index e93a2bde52..eb0091fd1a 100644
--- a/docs/Mono.Android/en/Javax.Sql/IRowSetReader.xml
+++ b/docs/Mono.Android/en/Javax.Sql/IRowSetReader.xml
@@ -25,7 +25,7 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>The facility that a disconnected &lt;code&gt;RowSet&lt;/code&gt; object calls on
+    <summary>The facility that a disconnected <c>RowSet</c> object calls on
             to populate itself with rows of data.</summary>
     <remarks>
       <para>
@@ -65,10 +65,10 @@
         <Parameter Name="caller" Type="Javax.Sql.IRowSetInternal" />
       </Parameters>
       <Docs>
-        <param name="caller">the &lt;code&gt;RowSet&lt;/code&gt; object (1) that has implemented the
-                    &lt;code&gt;RowSetInternal&lt;/code&gt; interface, (2) with which this reader is
-                   registered, and (3) whose &lt;code&gt;execute&lt;/code&gt; method called this reader</param>
-        <summary>Reads the new contents of the calling &lt;code&gt;RowSet&lt;/code&gt; object.</summary>
+        <param name="caller">the <c>RowSet</c> object (1) that has implemented the
+                    <c>RowSetInternal</c> interface, (2) with which this reader is
+                   registered, and (3) whose <c>execute</c> method called this reader</param>
+        <summary>Reads the new contents of the calling <c>RowSet</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Javax.Sql/IRowSetWriter.xml b/docs/Mono.Android/en/Javax.Sql/IRowSetWriter.xml
index 45afbaa4d7..487f382cae 100644
--- a/docs/Mono.Android/en/Javax.Sql/IRowSetWriter.xml
+++ b/docs/Mono.Android/en/Javax.Sql/IRowSetWriter.xml
@@ -25,7 +25,7 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>An object that implements the &lt;code&gt;RowSetWriter&lt;/code&gt; interface,
+    <summary>An object that implements the <c>RowSetWriter</c> interface,
             called a <i>writer</i>.</summary>
     <remarks>
       <para>
@@ -65,12 +65,13 @@
         <Parameter Name="caller" Type="Javax.Sql.IRowSetInternal" />
       </Parameters>
       <Docs>
-        <param name="caller">the &lt;code&gt;RowSet&lt;/code&gt; object (1) that has implemented the
-                    &lt;code&gt;RowSetInternal&lt;/code&gt; interface, (2) with which this writer is
+        <param name="caller">the <c>RowSet</c> object (1) that has implemented the
+                    <c>RowSetInternal</c> interface, (2) with which this writer is
                    registered, and (3) that called this method internally</param>
-        <summary>Writes the changes in this &lt;code&gt;RowSetWriter&lt;/code&gt; object's
+        <summary>Writes the changes in this <c>RowSetWriter</c> object's
             rowset back to the data source from which it got its data.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if the modified data was written; &lt;code&gt;false&lt;/code&gt;
+        <returns>
+          <c>true</c> if the modified data was written; <c>false</c>
                      if not, which will be the case if there is a conflict</returns>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Sql/IStatementEventListener.xml b/docs/Mono.Android/en/Javax.Sql/IStatementEventListener.xml
index 116fb9de79..7e93019ade 100644
--- a/docs/Mono.Android/en/Javax.Sql/IStatementEventListener.xml
+++ b/docs/Mono.Android/en/Javax.Sql/IStatementEventListener.xml
@@ -72,9 +72,9 @@
             closed
 </param>
         <param name="event">an event object describing the source of
-            the event and that the &lt;code&gt;PreparedStatement&lt;/code&gt; was closed.</param>
-        <summary>The driver calls this method on all &lt;code&gt;StatementEventListener&lt;/code&gt;s registered on the connection when it detects that a
-            &lt;code&gt;PreparedStatement&lt;/code&gt; is closed.</summary>
+            the event and that the <c>PreparedStatement</c> was closed.</param>
+        <summary>The driver calls this method on all <c>StatementEventListener</c>s registered on the connection when it detects that a
+            <c>PreparedStatement</c> is closed.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -119,12 +119,12 @@
         <param name="event">an event object describing the source of the event,
                                                  the statement that is invalid and the exception the
                                                  driver is about to throw.  The source of the event is
-                                                 the &lt;code&gt;PooledConnection&lt;/code&gt; which the invalid &lt;code&gt;PreparedStatement&lt;/code&gt;
+                                                 the <c>PooledConnection</c> which the invalid <c>PreparedStatement</c>
             is associated with.
             &lt;p&gt;</param>
-        <summary>The driver calls this method on all &lt;code&gt;StatementEventListener&lt;/code&gt;s
+        <summary>The driver calls this method on all <c>StatementEventListener</c>s
             registered on the connection when it detects that a
-            &lt;code&gt;PreparedStatement&lt;/code&gt; is invalid.</summary>
+            <c>PreparedStatement</c> is invalid.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Javax.Sql/RowSetEvent.xml b/docs/Mono.Android/en/Javax.Sql/RowSetEvent.xml
index 26f4778751..1c641fe235 100644
--- a/docs/Mono.Android/en/Javax.Sql/RowSetEvent.xml
+++ b/docs/Mono.Android/en/Javax.Sql/RowSetEvent.xml
@@ -31,8 +31,8 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>An &lt;code&gt;Event&lt;/code&gt; object generated when an event occurs to a
-            &lt;code&gt;RowSet&lt;/code&gt; object.</summary>
+    <summary>An <c>Event</c> object generated when an event occurs to a
+            <c>RowSet</c> object.</summary>
     <remarks>
       <para>
         <format type="text/html">
@@ -68,10 +68,10 @@
         <Parameter Name="source" Type="Javax.Sql.IRowSet" />
       </Parameters>
       <Docs>
-        <param name="source">the &lt;code&gt;RowSet&lt;/code&gt; object whose data has changed or
+        <param name="source">the <c>RowSet</c> object whose data has changed or
                    whose cursor has moved</param>
-        <summary>Constructs a &lt;code&gt;RowSetEvent&lt;/code&gt; object initialized with the
-            given &lt;code&gt;RowSet&lt;/code&gt; object.</summary>
+        <summary>Constructs a <c>RowSetEvent</c> object initialized with the
+            given <c>RowSet</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Javax.Sql/StatementEvent.xml b/docs/Mono.Android/en/Javax.Sql/StatementEvent.xml
index b314156f97..bd116a4609 100644
--- a/docs/Mono.Android/en/Javax.Sql/StatementEvent.xml
+++ b/docs/Mono.Android/en/Javax.Sql/StatementEvent.xml
@@ -18,8 +18,8 @@
     </Attribute>
   </Attributes>
   <Docs since="9">
-    <summary>A &lt;code&gt;StatementEvent&lt;/code&gt; is sent to all &lt;code&gt;StatementEventListener&lt;/code&gt;s which were
-            registered with a &lt;code&gt;PooledConnection&lt;/code&gt;.</summary>
+    <summary>A <c>StatementEvent</c> is sent to all <c>StatementEventListener</c>s which were
+            registered with a <c>PooledConnection</c>.</summary>
     <remarks>
       <para>
         <format type="text/html">
@@ -56,12 +56,12 @@
         <Parameter Name="statement" Type="Java.Sql.IPreparedStatement" />
       </Parameters>
       <Docs>
-        <param name="con">The &lt;code&gt;PooledConnection&lt;/code&gt; that the closed or invalid
-            &lt;code&gt;PreparedStatement&lt;/code&gt;is associated with.</param>
-        <param name="statement">The &lt;code&gt;PreparedStatement&lt;/code&gt; that is bieng closed or is invalid
+        <param name="con">The <c>PooledConnection</c> that the closed or invalid
+            <c>PreparedStatement</c>is associated with.</param>
+        <param name="statement">The <c>PreparedStatement</c> that is bieng closed or is invalid
             &lt;p&gt;</param>
-        <summary>Constructs a &lt;code&gt;StatementEvent&lt;/code&gt; with the specified &lt;code&gt;PooledConnection&lt;/code&gt; and
-            &lt;code&gt;PreparedStatement&lt;/code&gt;.</summary>
+        <summary>Constructs a <c>StatementEvent</c> with the specified <c>PooledConnection</c> and
+            <c>PreparedStatement</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -122,13 +122,13 @@
         <Parameter Name="exception" Type="Java.Sql.SQLException" />
       </Parameters>
       <Docs>
-        <param name="con">The &lt;code&gt;PooledConnection&lt;/code&gt; that the closed or invalid &lt;code&gt;PreparedStatement&lt;/code&gt;
+        <param name="con">The <c>PooledConnection</c> that the closed or invalid <c>PreparedStatement</c>
             is associated with.</param>
-        <param name="statement">The &lt;code&gt;PreparedStatement&lt;/code&gt; that is being closed or is invalid</param>
-        <param name="exception">The &lt;code&gt;SQLException &lt;/code&gt;the driver is about to throw to
+        <param name="statement">The <c>PreparedStatement</c> that is being closed or is invalid</param>
+        <param name="exception">The <c>SQLException </c>the driver is about to throw to
                                                          the application</param>
-        <summary>Constructs a &lt;code&gt;StatementEvent&lt;/code&gt; with the specified &lt;code&gt;PooledConnection&lt;/code&gt;,
-            &lt;code&gt;PreparedStatement&lt;/code&gt; and &lt;code&gt;SQLException&lt;/code&gt;</summary>
+        <summary>Constructs a <c>StatementEvent</c> with the specified <c>PooledConnection</c>,
+            <c>PreparedStatement</c> and <c>SQLException</c></summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -195,8 +195,8 @@
         <ReturnType>Java.Sql.SQLException</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Returns the &lt;code&gt;SQLException&lt;/code&gt; the driver is about to throw</summary>
-        <value>The &lt;code&gt;SQLException&lt;/code&gt; the driver is about to throw
+        <summary>Returns the <c>SQLException</c> the driver is about to throw</summary>
+        <value>The <c>SQLException</c> the driver is about to throw
             &lt;p&gt;</value>
         <remarks>
           <para>
@@ -233,8 +233,8 @@
         <ReturnType>Java.Sql.IPreparedStatement</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Returns the &lt;code&gt;PreparedStatement&lt;/code&gt; that is being closed or is invalid</summary>
-        <value>The &lt;code&gt;PreparedStatement&lt;/code&gt; that is being closed or is invalid
+        <summary>Returns the <c>PreparedStatement</c> that is being closed or is invalid</summary>
+        <value>The <c>PreparedStatement</c> that is being closed or is invalid
             &lt;p&gt;</value>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Xml.Datatype/DatatypeConfigurationException.xml b/docs/Mono.Android/en/Javax.Xml.Datatype/DatatypeConfigurationException.xml
index cc69909134..feabaabc73 100644
--- a/docs/Mono.Android/en/Javax.Xml.Datatype/DatatypeConfigurationException.xml
+++ b/docs/Mono.Android/en/Javax.Xml.Datatype/DatatypeConfigurationException.xml
@@ -51,7 +51,7 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <summary>Create a new &lt;code&gt;DatatypeConfigurationException&lt;/code&gt; with
+        <summary>Create a new <c>DatatypeConfigurationException</c> with
             no specified detail message and cause.</summary>
         <remarks>
           <para>
@@ -88,8 +88,8 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">The cause.  A &lt;code&gt;null&lt;/code&gt; value is permitted, and indicates that the cause is nonexistent or unknown.</param>
-        <summary>Create a new &lt;code&gt;DatatypeConfigurationException&lt;/code&gt; with
+        <param name="cause">The cause.  A <c>null</c> value is permitted, and indicates that the cause is nonexistent or unknown.</param>
+        <summary>Create a new <c>DatatypeConfigurationException</c> with
             the specified cause.</summary>
         <remarks>
           <para>
@@ -127,7 +127,7 @@
       </Parameters>
       <Docs>
         <param name="message">The detail message.</param>
-        <summary>Create a new &lt;code&gt;DatatypeConfigurationException&lt;/code&gt; with
+        <summary>Create a new <c>DatatypeConfigurationException</c> with
             the specified detail message.</summary>
         <remarks>
           <para>
@@ -189,8 +189,8 @@
       </Parameters>
       <Docs>
         <param name="message">The detail message.</param>
-        <param name="cause">The cause.  A &lt;code&gt;null&lt;/code&gt; value is permitted, and indicates that the cause is nonexistent or unknown.</param>
-        <summary>Create a new &lt;code&gt;DatatypeConfigurationException&lt;/code&gt; with
+        <param name="cause">The cause.  A <c>null</c> value is permitted, and indicates that the cause is nonexistent or unknown.</param>
+        <summary>Create a new <c>DatatypeConfigurationException</c> with
             the specified detail message and cause.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Xml.Datatype/DatatypeConstants.xml b/docs/Mono.Android/en/Javax.Xml.Datatype/DatatypeConstants.xml
index e33df9761e..918a5fce4c 100644
--- a/docs/Mono.Android/en/Javax.Xml.Datatype/DatatypeConstants.xml
+++ b/docs/Mono.Android/en/Javax.Xml.Datatype/DatatypeConstants.xml
@@ -276,7 +276,7 @@
         <ReturnType>Javax.Xml.Namespace.QName</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Fully qualified name for W3C XML Schema datatype &lt;code&gt;duration&lt;/code&gt;.</summary>
+        <summary>Fully qualified name for W3C XML Schema datatype <c>duration</c>.</summary>
         <value>To be added.</value>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Xml.Datatype/DatatypeFactory.xml b/docs/Mono.Android/en/Javax.Xml.Datatype/DatatypeFactory.xml
index 3f7c33e532..e8881ff162 100644
--- a/docs/Mono.Android/en/Javax.Xml.Datatype/DatatypeFactory.xml
+++ b/docs/Mono.Android/en/Javax.Xml.Datatype/DatatypeFactory.xml
@@ -18,7 +18,7 @@
     </Attribute>
   </Attributes>
   <Docs since="8">
-    <summary>Factory that creates new &lt;code&gt;javax.</summary>
+    <summary>Factory that creates new <c>javax.xml.datatype</c><c>Object</c>s that map XML to/from Java <c>Object</c>s.</summary>
     <remarks>
       <para>
         <format type="text/html">
@@ -218,9 +218,9 @@
       </Parameters>
       <Docs>
         <param name="durationInMilliSeconds">Duration in milliseconds to create.</param>
-        <summary>Obtain a new instance of a &lt;code&gt;Duration&lt;/code&gt;
-            specifying the &lt;code&gt;Duration&lt;/code&gt; as milliseconds.</summary>
-        <returns>New &lt;code&gt;Duration&lt;/code&gt; representing &lt;code&gt;durationInMilliSeconds&lt;/code&gt;.</returns>
+        <summary>Obtain a new instance of a <c>Duration</c>
+            specifying the <c>Duration</c> as milliseconds.</summary>
+        <returns>New <c>Duration</c> representing <c>durationInMilliSeconds</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -259,11 +259,12 @@
         <Parameter Name="lexicalRepresentation" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="lexicalRepresentation">&lt;code&gt;String&lt;/code&gt; representation of a &lt;code&gt;Duration&lt;/code&gt;.</param>
-        <summary>Obtain a new instance of a &lt;code&gt;Duration&lt;/code&gt;
-            specifying the &lt;code&gt;Duration&lt;/code&gt; as its string representation, "PnYnMnDTnHnMnS",
+        <param name="lexicalRepresentation">
+          <c>String</c> representation of a <c>Duration</c>.</param>
+        <summary>Obtain a new instance of a <c>Duration</c>
+            specifying the <c>Duration</c> as its string representation, "PnYnMnDTnHnMnS",
             as defined in XML Schema 1.</summary>
-        <returns>New &lt;code&gt;Duration&lt;/code&gt; created from parsing the &lt;code&gt;lexicalRepresentation&lt;/code&gt;.</returns>
+        <returns>New <c>Duration</c> created from parsing the <c>lexicalRepresentation</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -312,17 +313,17 @@
         <Parameter Name="seconds" Type="Java.Math.BigDecimal" />
       </Parameters>
       <Docs>
-        <param name="isPositive">Set to &lt;code&gt;false&lt;/code&gt; to create a negative duration. When the length
+        <param name="isPositive">Set to <c>false</c> to create a negative duration. When the length
               of the duration is zero, this parameter will be ignored.</param>
-        <param name="years">of this &lt;code&gt;Duration&lt;/code&gt;</param>
-        <param name="months">of this &lt;code&gt;Duration&lt;/code&gt;</param>
-        <param name="days">of this &lt;code&gt;Duration&lt;/code&gt;</param>
-        <param name="hours">of this &lt;code&gt;Duration&lt;/code&gt;</param>
-        <param name="minutes">of this &lt;code&gt;Duration&lt;/code&gt;</param>
-        <param name="seconds">of this &lt;code&gt;Duration&lt;/code&gt;</param>
-        <summary>Obtain a new instance of a &lt;code&gt;Duration&lt;/code&gt;
-            specifying the &lt;code&gt;Duration&lt;/code&gt; as isPositive, years, months, days, hours, minutes, seconds.</summary>
-        <returns>New &lt;code&gt;Duration&lt;/code&gt; created from the specified values.</returns>
+        <param name="years">of this <c>Duration</c></param>
+        <param name="months">of this <c>Duration</c></param>
+        <param name="days">of this <c>Duration</c></param>
+        <param name="hours">of this <c>Duration</c></param>
+        <param name="minutes">of this <c>Duration</c></param>
+        <param name="seconds">of this <c>Duration</c></param>
+        <summary>Obtain a new instance of a <c>Duration</c>
+            specifying the <c>Duration</c> as isPositive, years, months, days, hours, minutes, seconds.</summary>
+        <returns>New <c>Duration</c> created from the specified values.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -370,17 +371,17 @@
         <Parameter Name="seconds" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="isPositive">Set to &lt;code&gt;false&lt;/code&gt; to create a negative duration. When the length
+        <param name="isPositive">Set to <c>false</c> to create a negative duration. When the length
               of the duration is zero, this parameter will be ignored.</param>
-        <param name="years">of this &lt;code&gt;Duration&lt;/code&gt;</param>
-        <param name="months">of this &lt;code&gt;Duration&lt;/code&gt;</param>
-        <param name="days">of this &lt;code&gt;Duration&lt;/code&gt;</param>
-        <param name="hours">of this &lt;code&gt;Duration&lt;/code&gt;</param>
-        <param name="minutes">of this &lt;code&gt;Duration&lt;/code&gt;</param>
-        <param name="seconds">of this &lt;code&gt;Duration&lt;/code&gt;</param>
-        <summary>Obtain a new instance of a &lt;code&gt;Duration&lt;/code&gt;
-            specifying the &lt;code&gt;Duration&lt;/code&gt; as isPositive, years, months, days, hours, minutes, seconds.</summary>
-        <returns>New &lt;code&gt;Duration&lt;/code&gt; created from the specified values.</returns>
+        <param name="years">of this <c>Duration</c></param>
+        <param name="months">of this <c>Duration</c></param>
+        <param name="days">of this <c>Duration</c></param>
+        <param name="hours">of this <c>Duration</c></param>
+        <param name="minutes">of this <c>Duration</c></param>
+        <param name="seconds">of this <c>Duration</c></param>
+        <summary>Obtain a new instance of a <c>Duration</c>
+            specifying the <c>Duration</c> as isPositive, years, months, days, hours, minutes, seconds.</summary>
+        <returns>New <c>Duration</c> created from the specified values.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -421,11 +422,11 @@
         <Parameter Name="durationInMilliseconds" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="durationInMilliseconds">Milliseconds of &lt;code&gt;Duration&lt;/code&gt; to create.</param>
-        <summary>Create a &lt;code&gt;Duration&lt;/code&gt; of type &lt;code&gt;xdt:dayTimeDuration&lt;/code&gt; using the specified milliseconds as defined in
+        <param name="durationInMilliseconds">Milliseconds of <c>Duration</c> to create.</param>
+        <summary>Create a <c>Duration</c> of type <c>xdt:dayTimeDuration</c> using the specified milliseconds as defined in
             <see href="http://www.w3.org/TR/xpath-datamodel#dt-dayTimeDuration">
               XQuery 1.0 and XPath 2.0 Data Model, xdt:dayTimeDuration</see>.</summary>
-        <returns>New &lt;code&gt;Duration&lt;/code&gt; created with the specified &lt;code&gt;durationInMilliseconds&lt;/code&gt;.</returns>
+        <returns>New <c>Duration</c> created with the specified <c>durationInMilliseconds</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -465,10 +466,10 @@
       </Parameters>
       <Docs>
         <param name="lexicalRepresentation">Lexical representation of a duration.</param>
-        <summary>Create a &lt;code&gt;Duration&lt;/code&gt; of type &lt;code&gt;xdt:dayTimeDuration&lt;/code&gt; by parsing its &lt;code&gt;String&lt;/code&gt; representation,
+        <summary>Create a <c>Duration</c> of type <c>xdt:dayTimeDuration</c> by parsing its <c>String</c> representation,
             "&lt;em&gt;PnDTnHnMnS&lt;/em&gt;", <see href="http://www.w3.org/TR/xpath-datamodel#dt-dayTimeDuration">
               XQuery 1.0 and XPath 2.0 Data Model, xdt:dayTimeDuration</see>.</summary>
-        <returns>New &lt;code&gt;Duration&lt;/code&gt; created using the specified &lt;code&gt;lexicalRepresentation&lt;/code&gt;.</returns>
+        <returns>New <c>Duration</c> created using the specified <c>lexicalRepresentation</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -515,18 +516,18 @@
         <Parameter Name="second" Type="Java.Math.BigInteger" />
       </Parameters>
       <Docs>
-        <param name="isPositive">Set to &lt;code&gt;false&lt;/code&gt; to create a negative duration. When the length
+        <param name="isPositive">Set to <c>false</c> to create a negative duration. When the length
               of the duration is zero, this parameter will be ignored.</param>
-        <param name="day">Day of &lt;code&gt;Duration&lt;/code&gt;.</param>
-        <param name="hour">Hour of &lt;code&gt;Duration&lt;/code&gt;.</param>
-        <param name="minute">Minute of &lt;code&gt;Duration&lt;/code&gt;.</param>
-        <param name="second">Second of &lt;code&gt;Duration&lt;/code&gt;.</param>
-        <summary>Create a &lt;code&gt;Duration&lt;/code&gt; of type &lt;code&gt;xdt:dayTimeDuration&lt;/code&gt; using the specified
-            &lt;code&gt;day&lt;/code&gt;, &lt;code&gt;hour&lt;/code&gt;, &lt;code&gt;minute&lt;/code&gt; and &lt;code&gt;second&lt;/code&gt; as defined in
+        <param name="day">Day of <c>Duration</c>.</param>
+        <param name="hour">Hour of <c>Duration</c>.</param>
+        <param name="minute">Minute of <c>Duration</c>.</param>
+        <param name="second">Second of <c>Duration</c>.</param>
+        <summary>Create a <c>Duration</c> of type <c>xdt:dayTimeDuration</c> using the specified
+            <c>day</c>, <c>hour</c>, <c>minute</c> and <c>second</c> as defined in
             <see href="http://www.w3.org/TR/xpath-datamodel#dt-dayTimeDuration">
               XQuery 1.0 and XPath 2.0 Data Model, xdt:dayTimeDuration</see>.</summary>
-        <returns>New &lt;code&gt;Duration&lt;/code&gt; created with the specified &lt;code&gt;day&lt;/code&gt;, &lt;code&gt;hour&lt;/code&gt;, &lt;code&gt;minute&lt;/code&gt;
-            and &lt;code&gt;second&lt;/code&gt;.</returns>
+        <returns>New <c>Duration</c> created with the specified <c>day</c>, <c>hour</c>, <c>minute</c>
+            and <c>second</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -572,18 +573,18 @@
         <Parameter Name="second" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="isPositive">Set to &lt;code&gt;false&lt;/code&gt; to create a negative duration. When the length
+        <param name="isPositive">Set to <c>false</c> to create a negative duration. When the length
               of the duration is zero, this parameter will be ignored.</param>
-        <param name="day">Day of &lt;code&gt;Duration&lt;/code&gt;.</param>
-        <param name="hour">Hour of &lt;code&gt;Duration&lt;/code&gt;.</param>
-        <param name="minute">Minute of &lt;code&gt;Duration&lt;/code&gt;.</param>
-        <param name="second">Second of &lt;code&gt;Duration&lt;/code&gt;.</param>
-        <summary>Create a &lt;code&gt;Duration&lt;/code&gt; of type &lt;code&gt;xdt:dayTimeDuration&lt;/code&gt; using the specified
-            &lt;code&gt;day&lt;/code&gt;, &lt;code&gt;hour&lt;/code&gt;, &lt;code&gt;minute&lt;/code&gt; and &lt;code&gt;second&lt;/code&gt; as defined in
+        <param name="day">Day of <c>Duration</c>.</param>
+        <param name="hour">Hour of <c>Duration</c>.</param>
+        <param name="minute">Minute of <c>Duration</c>.</param>
+        <param name="second">Second of <c>Duration</c>.</param>
+        <summary>Create a <c>Duration</c> of type <c>xdt:dayTimeDuration</c> using the specified
+            <c>day</c>, <c>hour</c>, <c>minute</c> and <c>second</c> as defined in
             <see href="http://www.w3.org/TR/xpath-datamodel#dt-dayTimeDuration">
               XQuery 1.0 and XPath 2.0 Data Model, xdt:dayTimeDuration</see>.</summary>
-        <returns>New &lt;code&gt;Duration&lt;/code&gt; created with the specified &lt;code&gt;day&lt;/code&gt;, &lt;code&gt;hour&lt;/code&gt;, &lt;code&gt;minute&lt;/code&gt;
-            and &lt;code&gt;second&lt;/code&gt;.</returns>
+        <returns>New <c>Duration</c> created with the specified <c>day</c>, <c>hour</c>, <c>minute</c>
+            and <c>second</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -624,11 +625,11 @@
         <Parameter Name="durationInMilliseconds" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="durationInMilliseconds">Milliseconds of &lt;code&gt;Duration&lt;/code&gt; to create.</param>
-        <summary>Create a &lt;code&gt;Duration&lt;/code&gt; of type &lt;code&gt;xdt:yearMonthDuration&lt;/code&gt; using the specified milliseconds as defined in
+        <param name="durationInMilliseconds">Milliseconds of <c>Duration</c> to create.</param>
+        <summary>Create a <c>Duration</c> of type <c>xdt:yearMonthDuration</c> using the specified milliseconds as defined in
             <see href="http://www.w3.org/TR/xpath-datamodel#dt-yearMonthDuration">
               XQuery 1.0 and XPath 2.0 Data Model, xdt:yearMonthDuration</see>.</summary>
-        <returns>New &lt;code&gt;Duration&lt;/code&gt; created using the specified &lt;code&gt;durationInMilliseconds&lt;/code&gt;.</returns>
+        <returns>New <c>Duration</c> created using the specified <c>durationInMilliseconds</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -668,10 +669,10 @@
       </Parameters>
       <Docs>
         <param name="lexicalRepresentation">Lexical representation of a duration.</param>
-        <summary>Create a &lt;code&gt;Duration&lt;/code&gt; of type &lt;code&gt;xdt:yearMonthDuration&lt;/code&gt; by parsing its &lt;code&gt;String&lt;/code&gt; representation,
+        <summary>Create a <c>Duration</c> of type <c>xdt:yearMonthDuration</c> by parsing its <c>String</c> representation,
             "&lt;em&gt;PnYnM&lt;/em&gt;", <see href="http://www.w3.org/TR/xpath-datamodel#dt-yearMonthDuration">
               XQuery 1.0 and XPath 2.0 Data Model, xdt:yearMonthDuration</see>.</summary>
-        <returns>New &lt;code&gt;Duration&lt;/code&gt; created using the specified &lt;code&gt;lexicalRepresentation&lt;/code&gt;.</returns>
+        <returns>New <c>Duration</c> created using the specified <c>lexicalRepresentation</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -716,15 +717,15 @@
         <Parameter Name="month" Type="Java.Math.BigInteger" />
       </Parameters>
       <Docs>
-        <param name="isPositive">Set to &lt;code&gt;false&lt;/code&gt; to create a negative duration. When the length
+        <param name="isPositive">Set to <c>false</c> to create a negative duration. When the length
               of the duration is zero, this parameter will be ignored.</param>
-        <param name="year">Year of &lt;code&gt;Duration&lt;/code&gt;.</param>
-        <param name="month">Month of &lt;code&gt;Duration&lt;/code&gt;.</param>
-        <summary>Create a &lt;code&gt;Duration&lt;/code&gt; of type &lt;code&gt;xdt:yearMonthDuration&lt;/code&gt; using the specified
-            &lt;code&gt;year&lt;/code&gt; and &lt;code&gt;month&lt;/code&gt; as defined in
+        <param name="year">Year of <c>Duration</c>.</param>
+        <param name="month">Month of <c>Duration</c>.</param>
+        <summary>Create a <c>Duration</c> of type <c>xdt:yearMonthDuration</c> using the specified
+            <c>year</c> and <c>month</c> as defined in
             <see href="http://www.w3.org/TR/xpath-datamodel#dt-yearMonthyDuration">
               XQuery 1.0 and XPath 2.0 Data Model, xdt:yearMonthDuration</see>.</summary>
-        <returns>New &lt;code&gt;Duration&lt;/code&gt; created using the specified &lt;code&gt;year&lt;/code&gt; and &lt;code&gt;month&lt;/code&gt;.</returns>
+        <returns>New <c>Duration</c> created using the specified <c>year</c> and <c>month</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -768,15 +769,15 @@
         <Parameter Name="month" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="isPositive">Set to &lt;code&gt;false&lt;/code&gt; to create a negative duration. When the length
+        <param name="isPositive">Set to <c>false</c> to create a negative duration. When the length
               of the duration is zero, this parameter will be ignored.</param>
-        <param name="year">Year of &lt;code&gt;Duration&lt;/code&gt;.</param>
-        <param name="month">Month of &lt;code&gt;Duration&lt;/code&gt;.</param>
-        <summary>Create a &lt;code&gt;Duration&lt;/code&gt; of type &lt;code&gt;xdt:yearMonthDuration&lt;/code&gt; using the specified
-            &lt;code&gt;year&lt;/code&gt; and &lt;code&gt;month&lt;/code&gt; as defined in
+        <param name="year">Year of <c>Duration</c>.</param>
+        <param name="month">Month of <c>Duration</c>.</param>
+        <summary>Create a <c>Duration</c> of type <c>xdt:yearMonthDuration</c> using the specified
+            <c>year</c> and <c>month</c> as defined in
             <see href="http://www.w3.org/TR/xpath-datamodel#dt-yearMonthyDuration">
               XQuery 1.0 and XPath 2.0 Data Model, xdt:yearMonthDuration</see>.</summary>
-        <returns>New &lt;code&gt;Duration&lt;/code&gt; created using the specified &lt;code&gt;year&lt;/code&gt; and &lt;code&gt;month&lt;/code&gt;.</returns>
+        <returns>New <c>Duration</c> created using the specified <c>year</c> and <c>month</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -815,8 +816,8 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Obtain a new instance of a &lt;code&gt;DatatypeFactory&lt;/code&gt;.</summary>
-        <returns>New instance of a &lt;code&gt;DocumentBuilderFactory&lt;/code&gt;</returns>
+        <summary>Obtain a new instance of a <c>DatatypeFactory</c>.</summary>
+        <returns>New instance of a <c>DocumentBuilderFactory</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -901,8 +902,8 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Create a new instance of an &lt;code&gt;XMLGregorianCalendar&lt;/code&gt;.</summary>
-        <returns>New &lt;code&gt;XMLGregorianCalendar&lt;/code&gt; with all date/time datatype fields set to
+        <summary>Create a new instance of an <c>XMLGregorianCalendar</c>.</summary>
+        <returns>New <c>XMLGregorianCalendar</c> with all date/time datatype fields set to
               <c>DatatypeConstants#FIELD_UNDEFINED</c> or null.</returns>
         <remarks>
           <para>
@@ -942,9 +943,11 @@
         <Parameter Name="cal" Type="Java.Util.GregorianCalendar" />
       </Parameters>
       <Docs>
-        <param name="cal">&lt;code&gt;java.util.GregorianCalendar&lt;/code&gt; used to create &lt;code&gt;XMLGregorianCalendar&lt;/code&gt;</param>
-        <summary>Create an &lt;code&gt;XMLGregorianCalendar&lt;/code&gt; from a <c>GregorianCalendar</c>.</summary>
-        <returns>&lt;code&gt;XMLGregorianCalendar&lt;/code&gt; created from &lt;code&gt;java.util.GregorianCalendar&lt;/code&gt;</returns>
+        <param name="cal">
+          <c>java.util.GregorianCalendar</c> used to create <c>XMLGregorianCalendar</c></param>
+        <summary>Create an <c>XMLGregorianCalendar</c> from a <c>GregorianCalendar</c>.</summary>
+        <returns>
+          <c>XMLGregorianCalendar</c> created from <c>java.util.GregorianCalendar</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -987,7 +990,8 @@
       <Docs>
         <param name="lexicalRepresentation">Lexical representation of one the eight XML Schema date/time datatypes.</param>
         <summary>Create a new XMLGregorianCalendar by parsing the String as a lexical representation.</summary>
-        <returns>&lt;code&gt;XMLGregorianCalendar&lt;/code&gt; created from the &lt;code&gt;lexicalRepresentation&lt;/code&gt;.</returns>
+        <returns>
+          <c>XMLGregorianCalendar</c> created from the <c>lexicalRepresentation</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1036,17 +1040,18 @@
         <Parameter Name="timezone" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="year">of &lt;code&gt;XMLGregorianCalendar&lt;/code&gt; to be created.</param>
-        <param name="month">of &lt;code&gt;XMLGregorianCalendar&lt;/code&gt; to be created.</param>
-        <param name="day">of &lt;code&gt;XMLGregorianCalendar&lt;/code&gt; to be created.</param>
-        <param name="hour">of &lt;code&gt;XMLGregorianCalendar&lt;/code&gt; to be created.</param>
-        <param name="minute">of &lt;code&gt;XMLGregorianCalendar&lt;/code&gt; to be created.</param>
-        <param name="second">of &lt;code&gt;XMLGregorianCalendar&lt;/code&gt; to be created.</param>
-        <param name="fractionalSecond">of &lt;code&gt;XMLGregorianCalendar&lt;/code&gt; to be created.</param>
-        <param name="timezone">of &lt;code&gt;XMLGregorianCalendar&lt;/code&gt; to be created.</param>
+        <param name="year">of <c>XMLGregorianCalendar</c> to be created.</param>
+        <param name="month">of <c>XMLGregorianCalendar</c> to be created.</param>
+        <param name="day">of <c>XMLGregorianCalendar</c> to be created.</param>
+        <param name="hour">of <c>XMLGregorianCalendar</c> to be created.</param>
+        <param name="minute">of <c>XMLGregorianCalendar</c> to be created.</param>
+        <param name="second">of <c>XMLGregorianCalendar</c> to be created.</param>
+        <param name="fractionalSecond">of <c>XMLGregorianCalendar</c> to be created.</param>
+        <param name="timezone">of <c>XMLGregorianCalendar</c> to be created.</param>
         <summary>Constructor allowing for complete value spaces allowed by
             W3C XML Schema 1.</summary>
-        <returns>&lt;code&gt;XMLGregorianCalendar&lt;/code&gt; created from specified values.</returns>
+        <returns>
+          <c>XMLGregorianCalendar</c> created from specified values.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1097,17 +1102,19 @@
         <Parameter Name="timezone" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="year">of &lt;code&gt;XMLGregorianCalendar&lt;/code&gt; to be created.</param>
-        <param name="month">of &lt;code&gt;XMLGregorianCalendar&lt;/code&gt; to be created.</param>
-        <param name="day">of &lt;code&gt;XMLGregorianCalendar&lt;/code&gt; to be created.</param>
-        <param name="hour">of &lt;code&gt;XMLGregorianCalendar&lt;/code&gt; to be created.</param>
-        <param name="minute">of &lt;code&gt;XMLGregorianCalendar&lt;/code&gt; to be created.</param>
-        <param name="second">of &lt;code&gt;XMLGregorianCalendar&lt;/code&gt; to be created.</param>
-        <param name="millisecond">of &lt;code&gt;XMLGregorianCalendar&lt;/code&gt; to be created.</param>
-        <param name="timezone">of &lt;code&gt;XMLGregorianCalendar&lt;/code&gt; to be created.</param>
+        <param name="year">of <c>XMLGregorianCalendar</c> to be created.</param>
+        <param name="month">of <c>XMLGregorianCalendar</c> to be created.</param>
+        <param name="day">of <c>XMLGregorianCalendar</c> to be created.</param>
+        <param name="hour">of <c>XMLGregorianCalendar</c> to be created.</param>
+        <param name="minute">of <c>XMLGregorianCalendar</c> to be created.</param>
+        <param name="second">of <c>XMLGregorianCalendar</c> to be created.</param>
+        <param name="millisecond">of <c>XMLGregorianCalendar</c> to be created.</param>
+        <param name="timezone">of <c>XMLGregorianCalendar</c> to be created.</param>
         <summary>Constructor of value spaces that a
-            &lt;code&gt;java.</summary>
-        <returns>&lt;code&gt;XMLGregorianCalendar&lt;/code&gt; created from specified values.</returns>
+            <c>java.util.GregorianCalendar</c> instance would need to convert to an
+            <c>XMLGregorianCalendar</c> instance.</summary>
+        <returns>
+          <c>XMLGregorianCalendar</c> created from specified values.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1154,12 +1161,13 @@
         <Parameter Name="timezone" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="year">of &lt;code&gt;XMLGregorianCalendar&lt;/code&gt; to be created.</param>
-        <param name="month">of &lt;code&gt;XMLGregorianCalendar&lt;/code&gt; to be created.</param>
-        <param name="day">of &lt;code&gt;XMLGregorianCalendar&lt;/code&gt; to be created.</param>
+        <param name="year">of <c>XMLGregorianCalendar</c> to be created.</param>
+        <param name="month">of <c>XMLGregorianCalendar</c> to be created.</param>
+        <param name="day">of <c>XMLGregorianCalendar</c> to be created.</param>
         <param name="timezone">offset in minutes. <c>DatatypeConstants#FIELD_UNDEFINED</c> indicates optional field is not set.</param>
-        <summary>Create a Java representation of XML Schema builtin datatype &lt;code&gt;date&lt;/code&gt; or &lt;code&gt;g*&lt;/code&gt;.</summary>
-        <returns>&lt;code&gt;XMLGregorianCalendar&lt;/code&gt; created from parameter values.</returns>
+        <summary>Create a Java representation of XML Schema builtin datatype <c>date</c> or <c>g*</c>.</summary>
+        <returns>
+          <c>XMLGregorianCalendar</c> created from parameter values.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1211,8 +1219,9 @@
         <param name="minutes">number of minutes</param>
         <param name="seconds">number of seconds</param>
         <param name="timezone">offset in minutes. <c>DatatypeConstants#FIELD_UNDEFINED</c> indicates optional field is not set.</param>
-        <summary>Create a Java instance of XML Schema builtin datatype &lt;code&gt;time&lt;/code&gt;.</summary>
-        <returns>&lt;code&gt;XMLGregorianCalendar&lt;/code&gt; created from parameter values.</returns>
+        <summary>Create a Java instance of XML Schema builtin datatype <c>time</c>.</summary>
+        <returns>
+          <c>XMLGregorianCalendar</c> created from parameter values.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1263,10 +1272,11 @@
         <param name="hours">number of hours</param>
         <param name="minutes">number of minutes</param>
         <param name="seconds">number of seconds</param>
-        <param name="fractionalSecond">value of &lt;code&gt;null&lt;/code&gt; indicates that this optional field is not set.</param>
+        <param name="fractionalSecond">value of <c>null</c> indicates that this optional field is not set.</param>
         <param name="timezone">offset in minutes. <c>DatatypeConstants#FIELD_UNDEFINED</c> indicates optional field is not set.</param>
         <summary>Create a Java instance of XML Schema builtin datatype time.</summary>
-        <returns>&lt;code&gt;XMLGregorianCalendar&lt;/code&gt; created from parameter values.</returns>
+        <returns>
+          <c>XMLGregorianCalendar</c> created from parameter values.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1321,7 +1331,8 @@
         <param name="milliseconds">number of milliseconds</param>
         <param name="timezone">offset in minutes. <c>DatatypeConstants#FIELD_UNDEFINED</c> indicates optional field is not set.</param>
         <summary>Create a Java instance of XML Schema builtin datatype time.</summary>
-        <returns>&lt;code&gt;XMLGregorianCalendar&lt;/code&gt; created from parameter values.</returns>
+        <returns>
+          <c>XMLGregorianCalendar</c> created from parameter values.</returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Javax.Xml.Datatype/Duration.xml b/docs/Mono.Android/en/Javax.Xml.Datatype/Duration.xml
index 283418c7b6..cc7b9bcfd0 100644
--- a/docs/Mono.Android/en/Javax.Xml.Datatype/Duration.xml
+++ b/docs/Mono.Android/en/Javax.Xml.Datatype/Duration.xml
@@ -106,8 +106,9 @@
         <Parameter Name="rhs" Type="Javax.Xml.Datatype.Duration" />
       </Parameters>
       <Docs>
-        <param name="rhs">&lt;code&gt;Duration&lt;/code&gt; to add to this &lt;code&gt;Duration&lt;/code&gt;</param>
-        <summary>Computes a new duration whose value is &lt;code&gt;this+rhs&lt;/code&gt;.</summary>
+        <param name="rhs">
+          <c>Duration</c> to add to this <c>Duration</c></param>
+        <summary>Computes a new duration whose value is <c>this+rhs</c>.</summary>
         <returns>non-null valid Duration object.</returns>
         <remarks>
           <para>
@@ -237,8 +238,8 @@
       </Parameters>
       <Docs>
         <param name="duration">to compare</param>
-        <summary>Partial order relation comparison with this &lt;code&gt;Duration&lt;/code&gt; instance.</summary>
-        <returns>the relationship between &lt;code&gt;this&lt;/code&gt; &lt;code&gt;Duration&lt;/code&gt;and &lt;code&gt;duration&lt;/code&gt; parameter as
+        <summary>Partial order relation comparison with this <c>Duration</c> instance.</summary>
+        <returns>the relationship between <c>this</c><c>Duration</c>and <c>duration</c> parameter as
               <c>DatatypeConstants#LESSER</c>, <c>DatatypeConstants#EQUAL</c>, <c>DatatypeConstants#GREATER</c>
               or <c>DatatypeConstants#INDETERMINATE</c>.</returns>
         <remarks>
@@ -285,7 +286,7 @@
       <Docs>
         <summary>Obtains the value of the DAYS field as an integer value,
             or 0 if not present.</summary>
-        <value>Days of this &lt;code&gt;Duration&lt;/code&gt;.</value>
+        <value>Days of this <c>Duration</c>.</value>
         <remarks>
           <para>
             <format type="text/html">
@@ -412,13 +413,13 @@
         <Parameter Name="startInstant" Type="Java.Util.Calendar" />
       </Parameters>
       <Docs>
-        <param name="startInstant">The length of a month/year varies. The &lt;code&gt;startInstant&lt;/code&gt; is
+        <param name="startInstant">The length of a month/year varies. The <c>startInstant</c> is
                  used to disambiguate this variance. Specifically, this method
-                 returns the difference between &lt;code&gt;startInstant&lt;/code&gt; and
-                 &lt;code&gt;startInstant+duration&lt;/code&gt;</param>
+                 returns the difference between <c>startInstant</c> and
+                 <c>startInstant+duration</c></param>
         <summary>Returns the length of the duration in milliseconds.</summary>
-        <returns>milliseconds between &lt;code&gt;startInstant&lt;/code&gt; and
-              &lt;code&gt;startInstant&lt;/code&gt; plus this &lt;code&gt;Duration&lt;/code&gt;</returns>
+        <returns>milliseconds between <c>startInstant</c> and
+              <c>startInstant</c> plus this <c>Duration</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -461,13 +462,13 @@
         <Parameter Name="startInstant" Type="Java.Util.Date" />
       </Parameters>
       <Docs>
-        <param name="startInstant">The length of a month/year varies. The &lt;code&gt;startInstant&lt;/code&gt; is
+        <param name="startInstant">The length of a month/year varies. The <c>startInstant</c> is
                  used to disambiguate this variance. Specifically, this method
-                 returns the difference between &lt;code&gt;startInstant&lt;/code&gt; and
-                 &lt;code&gt;startInstant+duration&lt;/code&gt;.</param>
+                 returns the difference between <c>startInstant</c> and
+                 <c>startInstant+duration</c>.</param>
         <summary>Returns the length of the duration in milliseconds.</summary>
-        <returns>milliseconds between &lt;code&gt;startInstant&lt;/code&gt; and
-              &lt;code&gt;startInstant&lt;/code&gt; plus this &lt;code&gt;Duration&lt;/code&gt;</returns>
+        <returns>milliseconds between <c>startInstant</c> and
+              <c>startInstant</c> plus this <c>Duration</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -507,7 +508,7 @@
       <Docs>
         <summary>Obtains the value of the HOURS field as an integer value,
             or 0 if not present.</summary>
-        <value>Hours of this &lt;code&gt;Duration&lt;/code&gt;.</value>
+        <value>Hours of this <c>Duration</c>.</value>
         <remarks>
           <para>
             <format type="text/html">
@@ -546,9 +547,10 @@
         <Parameter Name="duration" Type="Javax.Xml.Datatype.Duration" />
       </Parameters>
       <Docs>
-        <param name="duration">&lt;code&gt;Duration&lt;/code&gt; to test this &lt;code&gt;Duration&lt;/code&gt; against.</param>
+        <param name="duration">
+          <c>Duration</c> to test this <c>Duration</c> against.</param>
         <summary>Checks if this duration object is strictly longer than
-            another &lt;code&gt;Duration&lt;/code&gt; object.</summary>
+            another <c>Duration</c> object.</summary>
         <returns>true if the duration represented by this object
                  is longer than the given duration. false otherwise.</returns>
         <remarks>
@@ -640,11 +642,13 @@
         <Parameter Name="duration" Type="Javax.Xml.Datatype.Duration" />
       </Parameters>
       <Docs>
-        <param name="duration">&lt;code&gt;Duration&lt;/code&gt; to test this &lt;code&gt;Duration&lt;/code&gt; against.</param>
+        <param name="duration">
+          <c>Duration</c> to test this <c>Duration</c> against.</param>
         <summary>Checks if this duration object is strictly shorter than
-            another &lt;code&gt;Duration&lt;/code&gt; object.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if &lt;code&gt;duration&lt;/code&gt; parameter is shorter than this &lt;code&gt;Duration&lt;/code&gt;,
-              else &lt;code&gt;false&lt;/code&gt;.</returns>
+            another <c>Duration</c> object.</summary>
+        <returns>
+          <c>true</c> if <c>duration</c> parameter is shorter than this <c>Duration</c>,
+              else <c>false</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -720,7 +724,7 @@
       <Docs>
         <summary>Obtains the value of the MINUTES field as an integer value,
             or 0 if not present.</summary>
-        <value>Minutes of this &lt;code&gt;Duration&lt;/code&gt;.</value>
+        <value>Minutes of this <c>Duration</c>.</value>
         <remarks>
           <para>
             <format type="text/html">
@@ -758,7 +762,7 @@
       <Docs>
         <summary>Obtains the value of the MONTHS field as an integer value,
             or 0 if not present.</summary>
-        <value>Months of this &lt;code&gt;Duration&lt;/code&gt;.</value>
+        <value>Months of this <c>Duration</c>.</value>
         <remarks>
           <para>
             <format type="text/html">
@@ -798,9 +802,9 @@
       </Parameters>
       <Docs>
         <param name="factor">to multiply by</param>
-        <summary>Computes a new duration whose value is &lt;code&gt;factor&lt;/code&gt; times
+        <summary>Computes a new duration whose value is <c>factor</c> times
             longer than the value of this duration.</summary>
-        <returns>returns a non-null valid &lt;code&gt;Duration&lt;/code&gt; object</returns>
+        <returns>returns a non-null valid <c>Duration</c> object</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -845,10 +849,10 @@
         <Parameter Name="factor" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="factor">Factor times longer of new &lt;code&gt;Duration&lt;/code&gt; to create.</param>
-        <summary>Computes a new duration whose value is &lt;code&gt;factor&lt;/code&gt; times
+        <param name="factor">Factor times longer of new <c>Duration</c> to create.</param>
+        <summary>Computes a new duration whose value is <c>factor</c> times
             longer than the value of this duration.</summary>
-        <returns>New &lt;code&gt;Duration&lt;/code&gt; that is &lt;code&gt;factor&lt;/code&gt;times longer than this &lt;code&gt;Duration&lt;/code&gt;.</returns>
+        <returns>New <c>Duration</c> that is <c>factor</c>times longer than this <c>Duration</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -886,9 +890,9 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Returns a new &lt;code&gt;Duration&lt;/code&gt; object whose
-            value is &lt;code&gt;-this&lt;/code&gt;.</summary>
-        <returns>always return a non-null valid &lt;code&gt;Duration&lt;/code&gt; object.</returns>
+        <summary>Returns a new <c>Duration</c> object whose
+            value is <c>-this</c>.</summary>
+        <returns>always return a non-null valid <c>Duration</c> object.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -927,10 +931,12 @@
         <Parameter Name="startTimeInstant" Type="Java.Util.Calendar" />
       </Parameters>
       <Docs>
-        <param name="startTimeInstant">&lt;code&gt;Calendar&lt;/code&gt; reference point.</param>
+        <param name="startTimeInstant">
+          <c>Calendar</c> reference point.</param>
         <summary>Converts the years and months fields into the days field
             by using a specific time instant as the reference point.</summary>
-        <returns>&lt;code&gt;Duration&lt;/code&gt; of years and months of this &lt;code&gt;Duration&lt;/code&gt; as days.</returns>
+        <returns>
+          <c>Duration</c> of years and months of this <c>Duration</c> as days.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1039,9 +1045,10 @@
         <Parameter Name="rhs" Type="Javax.Xml.Datatype.Duration" />
       </Parameters>
       <Docs>
-        <param name="rhs">&lt;code&gt;Duration&lt;/code&gt; to subtract from this &lt;code&gt;Duration&lt;/code&gt;.</param>
-        <summary>Computes a new duration whose value is &lt;code&gt;this-rhs&lt;/code&gt;.</summary>
-        <returns>New &lt;code&gt;Duration&lt;/code&gt; created from subtracting &lt;code&gt;rhs&lt;/code&gt; from this &lt;code&gt;Duration&lt;/code&gt;.</returns>
+        <param name="rhs">
+          <c>Duration</c> to subtract from this <c>Duration</c>.</param>
+        <summary>Computes a new duration whose value is <c>this-rhs</c>.</summary>
+        <returns>New <c>Duration</c> created from subtracting <c>rhs</c> from this <c>Duration</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1187,8 +1194,8 @@
         <ReturnType>System.Int32</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Get the years value of this &lt;code&gt;Duration&lt;/code&gt; as an &lt;code&gt;int&lt;/code&gt; or &lt;code&gt;0&lt;/code&gt; if not present.</summary>
-        <value>If the years field is present, return its value as an &lt;code&gt;int&lt;/code&gt;, else return &lt;code&gt;0&lt;/code&gt;.</value>
+        <summary>Get the years value of this <c>Duration</c> as an <c>int</c> or <c>0</c> if not present.</summary>
+        <value>If the years field is present, return its value as an <c>int</c>, else return <c>0</c>.</value>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Javax.Xml.Datatype/XMLGregorianCalendar.xml b/docs/Mono.Android/en/Javax.Xml.Datatype/XMLGregorianCalendar.xml
index eb22b24ec0..3c57136907 100644
--- a/docs/Mono.Android/en/Javax.Xml.Datatype/XMLGregorianCalendar.xml
+++ b/docs/Mono.Android/en/Javax.Xml.Datatype/XMLGregorianCalendar.xml
@@ -118,8 +118,8 @@
         <Parameter Name="duration" Type="Javax.Xml.Datatype.Duration" />
       </Parameters>
       <Docs>
-        <param name="duration">Duration to add to this &lt;code&gt;XMLGregorianCalendar&lt;/code&gt;.</param>
-        <summary>Add &lt;code&gt;duration&lt;/code&gt; to this instance.</summary>
+        <param name="duration">Duration to add to this <c>XMLGregorianCalendar</c>.</param>
+        <summary>Add <c>duration</c> to this instance.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -196,7 +196,7 @@
       <Parameters />
       <Docs>
         <summary>Creates and returns a copy of this object.</summary>
-        <returns>copy of this &lt;code&gt;Object&lt;/code&gt;</returns>
+        <returns>copy of this <c>Object</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -235,10 +235,10 @@
         <Parameter Name="xmlGregorianCalendar" Type="Javax.Xml.Datatype.XMLGregorianCalendar" />
       </Parameters>
       <Docs>
-        <param name="xmlGregorianCalendar">Instance of &lt;code&gt;XMLGregorianCalendar&lt;/code&gt; to compare</param>
+        <param name="xmlGregorianCalendar">Instance of <c>XMLGregorianCalendar</c> to compare</param>
         <summary>Compare two instances of W3C XML Schema 1.</summary>
-        <returns>The relationship between &lt;code&gt;this&lt;/code&gt; &lt;code&gt;XMLGregorianCalendar&lt;/code&gt; and
-              the specified &lt;code&gt;xmlGregorianCalendar&lt;/code&gt; as
+        <returns>The relationship between <c>this</c><c>XMLGregorianCalendar</c> and
+              the specified <c>xmlGregorianCalendar</c> as
               <c>DatatypeConstants#LESSER</c>,
               <c>DatatypeConstants#EQUAL</c>,
               <c>DatatypeConstants#GREATER</c> or
@@ -458,7 +458,7 @@
       <Docs>
         <param name="defaultZoneoffset">default zoneoffset if this zoneoffset is
             <c>DatatypeConstants#FIELD_UNDEFINED</c>.</param>
-        <summary>Returns a &lt;code&gt;java.</summary>
+        <summary>Returns a <c>java.util.TimeZone</c> for this class.</summary>
         <returns>TimeZone for this.</returns>
         <remarks>
           <para>
@@ -609,7 +609,7 @@
       </ReturnValue>
       <Docs>
         <summary>Return millisecond precision of <c>#getFractionalSecond()</c>.</summary>
-        <value>Millisecond  of this &lt;code&gt;XMLGregorianCalendar&lt;/code&gt;.</value>
+        <value>Millisecond  of this <c>XMLGregorianCalendar</c>.</value>
         <remarks>
           <para>
             <format type="text/html">
@@ -776,7 +776,9 @@
       <Parameters />
       <Docs>
         <summary>Normalize this instance to UTC.</summary>
-        <returns>&lt;code&gt;this&lt;/code&gt; &lt;code&gt;XMLGregorianCalendar&lt;/code&gt; normalized to UTC.</returns>
+        <returns>
+          <c>this</c>
+          <c>XMLGregorianCalendar</c> normalized to UTC.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -813,7 +815,7 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Reset this &lt;code&gt;XMLGregorianCalendar&lt;/code&gt; to its original values.</summary>
+        <summary>Reset this <c>XMLGregorianCalendar</c> to its original values.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -1007,7 +1009,7 @@
             "#datetimefield-minute"&gt;minute field of date/time field mapping table.</param>
         <param name="second">value constraints are summarized in
             "#datetimefield-second"&gt;second field of date/time field mapping table.</param>
-        <param name="fractional">value of &lt;code&gt;null&lt;/code&gt; indicates this optional
+        <param name="fractional">value of <c>null</c> indicates this optional
               field is not set.</param>
         <summary>Set time as one unit, including the optional infinite precision
             fractional seconds.</summary>
@@ -1108,7 +1110,7 @@
       </Parameters>
       <Docs>
         <param name="year">value constraints summarized in "#datetimefield-year"&gt;year field of date/time field mapping table.</param>
-        <summary>Set low and high order component of XSD &lt;code&gt;dateTime&lt;/code&gt; year field.</summary>
+        <summary>Set low and high order component of XSD <c>dateTime</c> year field.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -1269,7 +1271,7 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Convert this &lt;code&gt;XMLGregorianCalendar&lt;/code&gt; to a <c>GregorianCalendar</c>.</summary>
+        <summary>Convert this <c>XMLGregorianCalendar</c> to a <c>GregorianCalendar</c>.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
@@ -1312,15 +1314,15 @@
         <Parameter Name="defaults" Type="Javax.Xml.Datatype.XMLGregorianCalendar" />
       </Parameters>
       <Docs>
-        <param name="timezone">provide Timezone. &lt;code&gt;null&lt;/code&gt; is a legal value.</param>
+        <param name="timezone">provide Timezone. <c>null</c> is a legal value.</param>
         <param name="aLocale">provide explicit Locale. Use default GregorianCalendar locale if
-                            value is &lt;code&gt;null&lt;/code&gt;.</param>
+                            value is <c>null</c>.</param>
         <param name="defaults">provide default field values to use when corresponding
                             field for this instance is FIELD_UNDEFINED or null.
-                            If &lt;code&gt;defaults&lt;/code&gt;is &lt;code&gt;null&lt;/code&gt; or a field
-                            within the specified &lt;code&gt;defaults&lt;/code&gt; is undefined,
-                            just use &lt;code&gt;java.util.GregorianCalendar&lt;/code&gt; defaults.</param>
-        <summary>Convert this &lt;code&gt;XMLGregorianCalendar&lt;/code&gt; along with provided parameters
+                            If <c>defaults</c>is <c>null</c> or a field
+                            within the specified <c>defaults</c> is undefined,
+                            just use <c>java.util.GregorianCalendar</c> defaults.</param>
+        <summary>Convert this <c>XMLGregorianCalendar</c> along with provided parameters
             to a <c>GregorianCalendar</c> instance.</summary>
         <returns>a java.util.GregorianCalendar conversion of this instance.</returns>
         <remarks>
@@ -1359,8 +1361,8 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Return the lexical representation of &lt;code&gt;this&lt;/code&gt; instance.</summary>
-        <returns>XML, as &lt;code&gt;String&lt;/code&gt;, representation of this &lt;code&gt;XMLGregorianCalendar&lt;/code&gt;</returns>
+        <summary>Return the lexical representation of <c>this</c> instance.</summary>
+        <returns>XML, as <c>String</c>, representation of this <c>XMLGregorianCalendar</c></returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Javax.Xml.Namespace/INamespaceContext.xml b/docs/Mono.Android/en/Javax.Xml.Namespace/INamespaceContext.xml
index 88994b8fe1..e3a86080fd 100644
--- a/docs/Mono.Android/en/Javax.Xml.Namespace/INamespaceContext.xml
+++ b/docs/Mono.Android/en/Javax.Xml.Namespace/INamespaceContext.xml
@@ -149,7 +149,8 @@
         <param name="namespaceURI">URI of Namespace to lookup</param>
         <summary>Get all prefixes bound to a Namespace URI in the current
             scope.</summary>
-        <returns>&lt;code&gt;Iterator&lt;/code&gt; for all prefixes bound to the
+        <returns>
+          <c>Iterator</c> for all prefixes bound to the
             Namespace URI in the current scope</returns>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Xml.Namespace/QName.xml b/docs/Mono.Android/en/Javax.Xml.Namespace/QName.xml
index e4fcaa6a7b..fb03fe7676 100644
--- a/docs/Mono.Android/en/Javax.Xml.Namespace/QName.xml
+++ b/docs/Mono.Android/en/Javax.Xml.Namespace/QName.xml
@@ -31,7 +31,8 @@
     </Attribute>
   </Attributes>
   <Docs since="8">
-    <summary>&lt;code&gt;QName&lt;/code&gt; represents a &lt;strong&gt;qualified name&lt;/strong&gt;
+    <summary>
+      <c>QName</c> represents a &lt;strong&gt;qualified name&lt;/strong&gt;
             as defined in the XML specifications: <see href="http://www.w3.org/TR/xmlschema-2/#QName">XML Schema Part2:
             Datatypes specification</see>, <see href="http://www.w3.org/TR/REC-xml-names/#ns-qualnames">Namespaces
             in XML</see>, <see href="http://www.w3.org/XML/xml-names-19990114-errata">Namespaces
@@ -71,8 +72,9 @@
         <Parameter Name="localPart" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="localPart">local part of the &lt;code&gt;QName&lt;/code&gt;</param>
-        <summary>&lt;code&gt;QName&lt;/code&gt; constructor specifying the local part.</summary>
+        <param name="localPart">local part of the <c>QName</c></param>
+        <summary>
+          <c>QName</c> constructor specifying the local part.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -134,9 +136,10 @@
         <Parameter Name="localPart" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="namespaceURI">Namespace URI of the &lt;code&gt;QName&lt;/code&gt;</param>
-        <param name="localPart">local part of the &lt;code&gt;QName&lt;/code&gt;</param>
-        <summary>&lt;code&gt;QName&lt;/code&gt; constructor specifying the Namespace URI
+        <param name="namespaceURI">Namespace URI of the <c>QName</c></param>
+        <param name="localPart">local part of the <c>QName</c></param>
+        <summary>
+          <c>QName</c> constructor specifying the Namespace URI
             and local part.</summary>
         <remarks>
           <para>
@@ -176,10 +179,11 @@
         <Parameter Name="prefix" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="namespaceURI">Namespace URI of the &lt;code&gt;QName&lt;/code&gt;</param>
-        <param name="localPart">local part of the &lt;code&gt;QName&lt;/code&gt;</param>
-        <param name="prefix">prefix of the &lt;code&gt;QName&lt;/code&gt;</param>
-        <summary>&lt;code&gt;QName&lt;/code&gt; constructor specifying the Namespace URI,
+        <param name="namespaceURI">Namespace URI of the <c>QName</c></param>
+        <param name="localPart">local part of the <c>QName</c></param>
+        <param name="prefix">prefix of the <c>QName</c></param>
+        <summary>
+          <c>QName</c> constructor specifying the Namespace URI,
             local part and prefix.</summary>
         <remarks>
           <para>
@@ -219,12 +223,13 @@
         <Parameter Name="objectToTest" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="objectToTest">the &lt;code&gt;Object&lt;/code&gt; to test for
-            equality with this &lt;code&gt;QName&lt;/code&gt;</param>
-        <summary>Test this &lt;code&gt;QName&lt;/code&gt; for equality with another
-            &lt;code&gt;Object&lt;/code&gt;.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if the given &lt;code&gt;Object&lt;/code&gt; is
-            equal to this &lt;code&gt;QName&lt;/code&gt; else &lt;code&gt;false&lt;/code&gt;</returns>
+        <param name="objectToTest">the <c>Object</c> to test for
+            equality with this <c>QName</c></param>
+        <summary>Test this <c>QName</c> for equality with another
+            <c>Object</c>.</summary>
+        <returns>
+          <c>true</c> if the given <c>Object</c> is
+            equal to this <c>QName</c> else <c>false</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -261,8 +266,8 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Generate the hash code for this &lt;code&gt;QName&lt;/code&gt;.</summary>
-        <returns>hash code for this &lt;code&gt;QName&lt;/code&gt; &lt;code&gt;Object&lt;/code&gt;</returns>
+        <summary>Generate the hash code for this <c>QName</c>.</summary>
+        <returns>hash code for this <c>QName</c><c>Object</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -332,8 +337,8 @@
         <ReturnType>System.String</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Get the local part of this &lt;code&gt;QName&lt;/code&gt;.</summary>
-        <value>local part of this &lt;code&gt;QName&lt;/code&gt;</value>
+        <summary>Get the local part of this <c>QName</c>.</summary>
+        <value>local part of this <c>QName</c></value>
         <remarks>
           <para>
             <format type="text/html">
@@ -369,8 +374,8 @@
         <ReturnType>System.String</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Get the Namespace URI of this &lt;code&gt;QName&lt;/code&gt;.</summary>
-        <value>Namespace URI of this &lt;code&gt;QName&lt;/code&gt;</value>
+        <summary>Get the Namespace URI of this <c>QName</c>.</summary>
+        <value>Namespace URI of this <c>QName</c></value>
         <remarks>
           <para>
             <format type="text/html">
@@ -406,8 +411,8 @@
         <ReturnType>System.String</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Get the prefix of this &lt;code&gt;QName&lt;/code&gt;.</summary>
-        <value>prefix of this &lt;code&gt;QName&lt;/code&gt;</value>
+        <summary>Get the prefix of this <c>QName</c>.</summary>
+        <value>prefix of this <c>QName</c></value>
         <remarks>
           <para>
             <format type="text/html">
@@ -508,11 +513,14 @@
         <Parameter Name="qNameAsString" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="qNameAsString">&lt;code&gt;String&lt;/code&gt; representation
-            of the &lt;code&gt;QName&lt;/code&gt;</param>
-        <summary>&lt;code&gt;QName&lt;/code&gt; derived from parsing the formatted
-            &lt;code&gt;String&lt;/code&gt;.</summary>
-        <returns>&lt;code&gt;QName&lt;/code&gt; corresponding to the given &lt;code&gt;String&lt;/code&gt;</returns>
+        <param name="qNameAsString">
+          <c>String</c> representation
+            of the <c>QName</c></param>
+        <summary>
+          <c>QName</c> derived from parsing the formatted
+            <c>String</c>.</summary>
+        <returns>
+          <c>QName</c> corresponding to the given <c>String</c></returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Javax.Xml.Parsers/DocumentBuilder.xml b/docs/Mono.Android/en/Javax.Xml.Parsers/DocumentBuilder.xml
index 882dd75347..de0f9b6310 100644
--- a/docs/Mono.Android/en/Javax.Xml.Parsers/DocumentBuilder.xml
+++ b/docs/Mono.Android/en/Javax.Xml.Parsers/DocumentBuilder.xml
@@ -404,10 +404,11 @@
       </Parameters>
       <Docs>
         <param name="is">InputStream containing the content to be parsed.</param>
-        <summary>Parse the content of the given &lt;code&gt;InputStream&lt;/code&gt; as an XML
+        <summary>Parse the content of the given <c>InputStream</c> as an XML
             document and return a new DOM <c>Document</c> object.</summary>
-        <returns>&lt;code&gt;Document&lt;/code&gt; result of parsing the
-             &lt;code&gt;InputStream&lt;/code&gt;</returns>
+        <returns>
+          <c>Document</c> result of parsing the
+             <c>InputStream</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -497,7 +498,7 @@
       <Docs>
         <param name="is">InputStream containing the content to be parsed.</param>
         <param name="systemId">Provide a base for resolving relative URIs.</param>
-        <summary>Parse the content of the given &lt;code&gt;InputStream&lt;/code&gt; as an
+        <summary>Parse the content of the given <c>InputStream</c> as an
             XML document and return a new DOM <c>Document</c> object.</summary>
         <returns>A new DOM Document object.</returns>
         <remarks>
@@ -666,7 +667,7 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Reset this &lt;code&gt;DocumentBuilder&lt;/code&gt; to its original configuration.</summary>
+        <summary>Reset this <c>DocumentBuilder</c> to its original configuration.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -705,7 +706,7 @@
         <summary>Get a reference to the the <c>Schema</c> being used by
             the XML processor.</summary>
         <value>
-          <c>Schema</c> being used or &lt;code&gt;null&lt;/code&gt;
+          <c>Schema</c> being used or <c>null</c>
              if none in use</value>
         <remarks>
           <para>
@@ -748,7 +749,7 @@
         <Parameter Name="er" Type="Org.Xml.Sax.IEntityResolver" />
       </Parameters>
       <Docs>
-        <param name="er">The &lt;code&gt;EntityResolver&lt;/code&gt; to be used to resolve entities
+        <param name="er">The <c>EntityResolver</c> to be used to resolve entities
                       present in the XML document to be parsed.</param>
         <summary>Specify the <c>EntityResolver</c> to be used to resolve
             entities present in the XML document to be parsed.</summary>
@@ -790,7 +791,7 @@
         <Parameter Name="eh" Type="Org.Xml.Sax.IErrorHandler" />
       </Parameters>
       <Docs>
-        <param name="eh">The &lt;code&gt;ErrorHandler&lt;/code&gt; to be used by the parser.</param>
+        <param name="eh">The <c>ErrorHandler</c> to be used by the parser.</param>
         <summary>Specify the <c>ErrorHandler</c> to be used by the parser.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Xml.Parsers/DocumentBuilderFactory.xml b/docs/Mono.Android/en/Javax.Xml.Parsers/DocumentBuilderFactory.xml
index e1a87366f8..1f5f2fbaee 100644
--- a/docs/Mono.Android/en/Javax.Xml.Parsers/DocumentBuilderFactory.xml
+++ b/docs/Mono.Android/en/Javax.Xml.Parsers/DocumentBuilderFactory.xml
@@ -306,7 +306,8 @@
         <ReturnType>System.Boolean</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="ignoreComments">&lt;code&gt;boolean&lt;/code&gt; value to ignore comments during processing</param>
+        <param name="ignoreComments">
+          <c>boolean</c> value to ignore comments during processing</param>
         <summary>Indicates whether or not the factory is configured to produce
             parsers which ignores comments. -or- Specifies that the parser produced by this code will
             ignore comments.</summary>
@@ -623,7 +624,8 @@
         <ReturnType>Javax.Xml.Validation.Schema</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="schema">&lt;code&gt;Schema&lt;/code&gt; to use or &lt;code&gt;null&lt;/code&gt; to remove a schema.</param>
+        <param name="schema">
+          <c>Schema</c> to use or <c>null</c> to remove a schema.</param>
         <summary>Gets the <c>Schema</c> object specified through
             the <c>#setSchema(Schema schema)</c> method. -or- Set the <c>Schema</c> to be used by parsers created
             from this factory.</summary>
@@ -730,8 +732,8 @@
       </Parameters>
       <Docs>
         <param name="name">Feature name.</param>
-        <param name="value">Is feature state &lt;code&gt;true&lt;/code&gt; or &lt;code&gt;false&lt;/code&gt;.</param>
-        <summary>Set a feature for this &lt;code&gt;DocumentBuilderFactory&lt;/code&gt; and &lt;code&gt;DocumentBuilder&lt;/code&gt;s created by this factory.</summary>
+        <param name="value">Is feature state <c>true</c> or <c>false</c>.</param>
+        <summary>Set a feature for this <c>DocumentBuilderFactory</c> and <c>DocumentBuilder</c>s created by this factory.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -890,8 +892,8 @@
         <ReturnType>System.Boolean</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="state">Set XInclude processing to &lt;code&gt;true&lt;/code&gt; or
-              &lt;code&gt;false&lt;/code&gt;</param>
+        <param name="state">Set XInclude processing to <c>true</c> or
+              <c>false</c></param>
         <summary>Get state of XInclude processing. -or- Set state of XInclude processing.</summary>
         <value>current state of XInclude processing</value>
         <remarks>
diff --git a/docs/Mono.Android/en/Javax.Xml.Parsers/FactoryConfigurationError.xml b/docs/Mono.Android/en/Javax.Xml.Parsers/FactoryConfigurationError.xml
index 26ca83f29e..9f166a62f5 100644
--- a/docs/Mono.Android/en/Javax.Xml.Parsers/FactoryConfigurationError.xml
+++ b/docs/Mono.Android/en/Javax.Xml.Parsers/FactoryConfigurationError.xml
@@ -52,7 +52,7 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <summary>Create a new &lt;code&gt;FactoryConfigurationError&lt;/code&gt; with no
+        <summary>Create a new <c>FactoryConfigurationError</c> with no
             detail message.</summary>
         <remarks>
           <para>
@@ -91,8 +91,8 @@
       <Docs>
         <param name="e">The exception to be encapsulated in a
             FactoryConfigurationError.</param>
-        <summary>Create a new &lt;code&gt;FactoryConfigurationError&lt;/code&gt; with a
-            given &lt;code&gt;Exception&lt;/code&gt; base cause of the error.</summary>
+        <summary>Create a new <c>FactoryConfigurationError</c> with a
+            given <c>Exception</c> base cause of the error.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -129,8 +129,8 @@
       </Parameters>
       <Docs>
         <param name="msg">The error message for the exception.</param>
-        <summary>Create a new &lt;code&gt;FactoryConfigurationError&lt;/code&gt; with
-            the &lt;code&gt;String &lt;/code&gt; specified as an error message.</summary>
+        <summary>Create a new <c>FactoryConfigurationError</c> with
+            the <c>String </c> specified as an error message.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -170,8 +170,8 @@
         <param name="e">The exception to be encapsulated in a
             FactoryConfigurationError</param>
         <param name="msg">The detail message.</param>
-        <summary>Create a new &lt;code&gt;FactoryConfigurationError&lt;/code&gt; with the
-            given &lt;code&gt;Exception&lt;/code&gt; base cause and detail message.</summary>
+        <summary>Create a new <c>FactoryConfigurationError</c> with the
+            given <c>Exception</c> base cause and detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Javax.Xml.Parsers/ParserConfigurationException.xml b/docs/Mono.Android/en/Javax.Xml.Parsers/ParserConfigurationException.xml
index 2d0bde2e3f..5220566f15 100644
--- a/docs/Mono.Android/en/Javax.Xml.Parsers/ParserConfigurationException.xml
+++ b/docs/Mono.Android/en/Javax.Xml.Parsers/ParserConfigurationException.xml
@@ -51,7 +51,7 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <summary>Create a new &lt;code&gt;ParserConfigurationException&lt;/code&gt; with no
+        <summary>Create a new <c>ParserConfigurationException</c> with no
             detail message.</summary>
         <remarks>
           <para>
@@ -89,8 +89,8 @@
       </Parameters>
       <Docs>
         <param name="msg">The error message for the exception.</param>
-        <summary>Create a new &lt;code&gt;ParserConfigurationException&lt;/code&gt; with
-            the &lt;code&gt;String&lt;/code&gt; specified as an error message.</summary>
+        <summary>Create a new <c>ParserConfigurationException</c> with
+            the <c>String</c> specified as an error message.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Javax.Xml.Parsers/SAXParser.xml b/docs/Mono.Android/en/Javax.Xml.Parsers/SAXParser.xml
index 820c5c7b6a..c1fd5a6b59 100644
--- a/docs/Mono.Android/en/Javax.Xml.Parsers/SAXParser.xml
+++ b/docs/Mono.Android/en/Javax.Xml.Parsers/SAXParser.xml
@@ -1081,7 +1081,7 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Reset this &lt;code&gt;SAXParser&lt;/code&gt; to its original configuration.</summary>
+        <summary>Reset this <c>SAXParser</c> to its original configuration.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -1120,7 +1120,7 @@
         <summary>Get a reference to the the <c>Schema</c> being used by
             the XML processor.</summary>
         <value>
-          <c>Schema</c> being used or &lt;code&gt;null&lt;/code&gt;
+          <c>Schema</c> being used or <c>null</c>
              if none in use</value>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Xml.Parsers/SAXParserFactory.xml b/docs/Mono.Android/en/Javax.Xml.Parsers/SAXParserFactory.xml
index 900b361ddb..0ec73ae933 100644
--- a/docs/Mono.Android/en/Javax.Xml.Parsers/SAXParserFactory.xml
+++ b/docs/Mono.Android/en/Javax.Xml.Parsers/SAXParserFactory.xml
@@ -374,7 +374,8 @@
         <ReturnType>Javax.Xml.Validation.Schema</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="schema">&lt;code&gt;Schema&lt;/code&gt; to use, &lt;code&gt;null&lt;/code&gt; to remove a schema.</param>
+        <param name="schema">
+          <c>Schema</c> to use, <c>null</c> to remove a schema.</param>
         <summary>Gets the <c>Schema</c> object specified through
             the <c>#setSchema(Schema schema)</c> method. -or- Set the <c>Schema</c> to be used by parsers created
             from this factory.</summary>
@@ -601,8 +602,8 @@
         <ReturnType>System.Boolean</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="state">Set XInclude processing to &lt;code&gt;true&lt;/code&gt; or
-              &lt;code&gt;false&lt;/code&gt;</param>
+        <param name="state">Set XInclude processing to <c>true</c> or
+              <c>false</c></param>
         <summary>Get state of XInclude processing. -or- Set state of XInclude processing.</summary>
         <value>current state of XInclude processing</value>
         <remarks>
diff --git a/docs/Mono.Android/en/Javax.Xml.Transform.Dom/DOMResult.xml b/docs/Mono.Android/en/Javax.Xml.Transform.Dom/DOMResult.xml
index 9607079940..15fe96dce0 100644
--- a/docs/Mono.Android/en/Javax.Xml.Transform.Dom/DOMResult.xml
+++ b/docs/Mono.Android/en/Javax.Xml.Transform.Dom/DOMResult.xml
@@ -289,8 +289,8 @@
       </ReturnValue>
       <Docs>
         <summary>If <c>javax.xml.transform.TransformerFactory#getFeature</c>
-            returns &lt;code&gt;true&lt;/code&gt; when passed this value as an argument,
-            the &lt;code&gt;Transformer&lt;/code&gt; supports &lt;code&gt;Result&lt;/code&gt; output of this type.</summary>
+            returns <c>true</c> when passed this value as an argument,
+            the <c>Transformer</c> supports <c>Result</c> output of this type.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Javax.Xml.Transform.Sax/ITransformerHandler.xml b/docs/Mono.Android/en/Javax.Xml.Transform.Sax/ITransformerHandler.xml
index 62cbe26f9f..99635bdfd3 100644
--- a/docs/Mono.Android/en/Javax.Xml.Transform.Sax/ITransformerHandler.xml
+++ b/docs/Mono.Android/en/Javax.Xml.Transform.Sax/ITransformerHandler.xml
@@ -75,10 +75,10 @@
         <Parameter Name="result" Type="Javax.Xml.Transform.IResult" />
       </Parameters>
       <Docs>
-        <param name="result">A &lt;code&gt;Result&lt;/code&gt; instance, should not be
-              &lt;code&gt;null&lt;/code&gt;.</param>
-        <summary>Set  the &lt;code&gt;Result&lt;/code&gt; associated with this
-            &lt;code&gt;TransformerHandler&lt;/code&gt; to be used for the transformation.</summary>
+        <param name="result">A <c>Result</c> instance, should not be
+              <c>null</c>.</param>
+        <summary>Set  the <c>Result</c> associated with this
+            <c>TransformerHandler</c> to be used for the transformation.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Javax.Xml.Transform.Sax/SAXResult.xml b/docs/Mono.Android/en/Javax.Xml.Transform.Sax/SAXResult.xml
index 966e1e6dea..b4351958c5 100644
--- a/docs/Mono.Android/en/Javax.Xml.Transform.Sax/SAXResult.xml
+++ b/docs/Mono.Android/en/Javax.Xml.Transform.Sax/SAXResult.xml
@@ -289,10 +289,10 @@
         <ReturnType>Org.Xml.Sax.Ext.ILexicalHandler</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="handler">A non-null &lt;code&gt;LexicalHandler&lt;/code&gt; for
+        <param name="handler">A non-null <c>LexicalHandler</c> for
             handling lexical parse events.</param>
         <summary>Get a SAX2 <c>org.xml.sax.ext.LexicalHandler</c> for the output. -or- Set the SAX2 <c>org.xml.sax.ext.LexicalHandler</c> for the output.</summary>
-        <value>A &lt;code&gt;LexicalHandler&lt;/code&gt;, or null.</value>
+        <value>A <c>LexicalHandler</c>, or null.</value>
         <remarks>
           <para>Property getter documentation:</para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Xml.Transform.Sax/SAXSource.xml b/docs/Mono.Android/en/Javax.Xml.Transform.Sax/SAXSource.xml
index 4d8b9ebd1c..46260b6d97 100644
--- a/docs/Mono.Android/en/Javax.Xml.Transform.Sax/SAXSource.xml
+++ b/docs/Mono.Android/en/Javax.Xml.Transform.Sax/SAXSource.xml
@@ -103,7 +103,7 @@
       <Docs>
         <param name="inputSource">An input source reference that must be non-null
             and that will be passed to the parse method of the reader.</param>
-        <summary>Create a &lt;code&gt;SAXSource&lt;/code&gt;, using a SAX &lt;code&gt;InputSource&lt;/code&gt;.</summary>
+        <summary>Create a <c>SAXSource</c>, using a SAX <c>InputSource</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -143,7 +143,7 @@
         <param name="reader">An XMLReader to be used for the parse.</param>
         <param name="inputSource">A SAX input source reference that must be non-null
             and that will be passed to the reader parse method.</param>
-        <summary>Create a &lt;code&gt;SAXSource&lt;/code&gt;, using an <c>org.xml.sax.XMLReader</c>
+        <summary>Create a <c>SAXSource</c>, using an <c>org.xml.sax.XMLReader</c>
             and a SAX InputSource.</summary>
         <remarks>
           <para>
@@ -376,7 +376,7 @@
         <param name="systemId">The system identifier as a URI string.</param>
         <summary>Get the base ID (URI or system ID) from where URIs
             will be resolved. -or- Set the system identifier for this Source.</summary>
-        <value>Base URL for the &lt;code&gt;Source&lt;/code&gt;, or &lt;code&gt;null&lt;/code&gt;.</value>
+        <value>Base URL for the <c>Source</c>, or <c>null</c>.</value>
         <remarks>
           <para>Property getter documentation:</para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Xml.Transform.Stream/StreamResult.xml b/docs/Mono.Android/en/Javax.Xml.Transform.Stream/StreamResult.xml
index 4d796baa22..ab68785404 100644
--- a/docs/Mono.Android/en/Javax.Xml.Transform.Stream/StreamResult.xml
+++ b/docs/Mono.Android/en/Javax.Xml.Transform.Stream/StreamResult.xml
@@ -402,7 +402,7 @@
       </Parameters>
       <Docs>
         <param name="f">Must a non-null File reference.</param>
-        <summary>Set the system ID from a &lt;code&gt;File&lt;/code&gt; reference.</summary>
+        <summary>Set the system ID from a <c>File</c> reference.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Javax.Xml.Transform/IErrorListener.xml b/docs/Mono.Android/en/Javax.Xml.Transform/IErrorListener.xml
index 253ffdd46f..7cd9a579ed 100644
--- a/docs/Mono.Android/en/Javax.Xml.Transform/IErrorListener.xml
+++ b/docs/Mono.Android/en/Javax.Xml.Transform/IErrorListener.xml
@@ -26,7 +26,7 @@
   </Attributes>
   <Docs since="8">
     <summary>To provide customized error handling, implement this interface and
-            use the &lt;code&gt;setErrorListener&lt;/code&gt; method to register an instance of the
+            use the <c>setErrorListener</c> method to register an instance of the
             implementation with the <c>javax.xml.transform.Transformer</c>.</summary>
     <remarks>
       <para>
@@ -111,7 +111,7 @@
       </Parameters>
       <Docs>
         <param name="exception">The error information encapsulated in a
-               &lt;code&gt;TransformerException&lt;/code&gt;.</param>
+               <c>TransformerException</c>.</param>
         <summary>Receive notification of a non-recoverable error.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Xml.Transform/Transformer.xml b/docs/Mono.Android/en/Javax.Xml.Transform/Transformer.xml
index 6f2f8205c1..36178f2398 100644
--- a/docs/Mono.Android/en/Javax.Xml.Transform/Transformer.xml
+++ b/docs/Mono.Android/en/Javax.Xml.Transform/Transformer.xml
@@ -281,7 +281,7 @@
         <Parameter Name="name" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="name">of &lt;code&gt;Object&lt;/code&gt; to get</param>
+        <param name="name">of <c>Object</c> to get</param>
         <summary>Get a parameter that was explicitly set with setParameter.</summary>
         <returns>A parameter that has been set with setParameter.</returns>
         <remarks>
@@ -388,7 +388,7 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Reset this &lt;code&gt;Transformer&lt;/code&gt; to its original configuration.</summary>
+        <summary>Reset this <c>Transformer</c> to its original configuration.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -585,9 +585,9 @@
       </Parameters>
       <Docs>
         <param name="xmlSource">The XML input to transform.</param>
-        <param name="outputTarget">The &lt;code&gt;Result&lt;/code&gt; of transforming the
-              &lt;code&gt;xmlSource&lt;/code&gt;.</param>
-        <summary>Transform the XML &lt;code&gt;Source&lt;/code&gt; to a &lt;code&gt;Result&lt;/code&gt;.</summary>
+        <param name="outputTarget">The <c>Result</c> of transforming the
+              <c>xmlSource</c>.</param>
+        <summary>Transform the XML <c>Source</c> to a <c>Result</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Javax.Xml.Transform/TransformerConfigurationException.xml b/docs/Mono.Android/en/Javax.Xml.Transform/TransformerConfigurationException.xml
index d4d08ba3aa..b0a92f25f7 100644
--- a/docs/Mono.Android/en/Javax.Xml.Transform/TransformerConfigurationException.xml
+++ b/docs/Mono.Android/en/Javax.Xml.Transform/TransformerConfigurationException.xml
@@ -51,7 +51,7 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <summary>Create a new &lt;code&gt;TransformerConfigurationException&lt;/code&gt; with no
+        <summary>Create a new <c>TransformerConfigurationException</c> with no
             detail message.</summary>
         <remarks>
           <para>
@@ -90,8 +90,8 @@
       <Docs>
         <param name="e">The exception to be encapsulated in a
             TransformerConfigurationException.</param>
-        <summary>Create a new &lt;code&gt;TransformerConfigurationException&lt;/code&gt; with a
-            given &lt;code&gt;Exception&lt;/code&gt; base cause of the error.</summary>
+        <summary>Create a new <c>TransformerConfigurationException</c> with a
+            given <c>Exception</c> base cause of the error.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -128,8 +128,8 @@
       </Parameters>
       <Docs>
         <param name="msg">The error message for the exception.</param>
-        <summary>Create a new &lt;code&gt;TransformerConfigurationException&lt;/code&gt; with
-            the &lt;code&gt;String &lt;/code&gt; specified as an error message.</summary>
+        <summary>Create a new <c>TransformerConfigurationException</c> with
+            the <c>String </c> specified as an error message.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -192,8 +192,8 @@
         <param name="e">The exception to be encapsulated in a
                  TransformerConfigurationException</param>
         <param name="msg">The detail message.</param>
-        <summary>Create a new &lt;code&gt;TransformerConfigurationException&lt;/code&gt; with the
-            given &lt;code&gt;Exception&lt;/code&gt; base cause and detail message.</summary>
+        <summary>Create a new <c>TransformerConfigurationException</c> with the
+            given <c>Exception</c> base cause and detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Javax.Xml.Transform/TransformerException.xml b/docs/Mono.Android/en/Javax.Xml.Transform/TransformerException.xml
index f9ab6c5bff..546872d6e0 100644
--- a/docs/Mono.Android/en/Javax.Xml.Transform/TransformerException.xml
+++ b/docs/Mono.Android/en/Javax.Xml.Transform/TransformerException.xml
@@ -432,7 +432,7 @@
       <Docs>
         <summary>Get the error message with location information
             appended.</summary>
-        <value>A &lt;code&gt;String&lt;/code&gt; representing the error message with
+        <value>A <c>String</c> representing the error message with
                     location information appended.</value>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Xml.Transform/TransformerFactory.xml b/docs/Mono.Android/en/Javax.Xml.Transform/TransformerFactory.xml
index 1f1457c98d..88624c348c 100644
--- a/docs/Mono.Android/en/Javax.Xml.Transform/TransformerFactory.xml
+++ b/docs/Mono.Android/en/Javax.Xml.Transform/TransformerFactory.xml
@@ -196,11 +196,11 @@
         <param name="title">The value of the title attribute to match.  May be null.</param>
         <param name="charset">The value of the charset attribute to match.  May be null.</param>
         <summary>Get the stylesheet specification(s) associated with the
-            XML &lt;code&gt;Source&lt;/code&gt; document via the
+            XML <c>Source</c> document via the
             <see href="http://www.w3.org/TR/xml-stylesheet/">
             xml-stylesheet processing instruction</see> that match the given criteria.</summary>
-        <returns>A &lt;code&gt;Source&lt;/code&gt; &lt;code&gt;Object&lt;/code&gt; suitable for passing
-              to the &lt;code&gt;TransformerFactory&lt;/code&gt;.</returns>
+        <returns>A <c>Source</c><c>Object</c> suitable for passing
+              to the <c>TransformerFactory</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -286,7 +286,7 @@
       <Docs>
         <param name="name">Feature name.</param>
         <summary>Look up the value of a feature.</summary>
-        <returns>The current state of the feature, &lt;code&gt;true&lt;/code&gt; or &lt;code&gt;false&lt;/code&gt;.</returns>
+        <returns>The current state of the feature, <c>true</c> or <c>false</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -488,8 +488,8 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Create a new &lt;code&gt;Transformer&lt;/code&gt; that performs a copy
-            of the &lt;code&gt;Source&lt;/code&gt; to the &lt;code&gt;Result&lt;/code&gt;.</summary>
+        <summary>Create a new <c>Transformer</c> that performs a copy
+            of the <c>Source</c> to the <c>Result</c>.</summary>
         <returns>A Transformer object that may be used to perform a transformation
             in a single thread, never null.</returns>
         <remarks>
@@ -533,17 +533,17 @@
         <Parameter Name="source" Type="Javax.Xml.Transform.ISource" />
       </Parameters>
       <Docs>
-        <param name="source">&lt;code&gt;Source &lt;/code&gt; of XSLT document used to create
-              &lt;code&gt;Transformer&lt;/code&gt;.
-              Examples of XML &lt;code&gt;Source&lt;/code&gt;s include
+        <param name="source">
+          <c>Source </c> of XSLT document used to create
+              <c>Transformer</c>.
+              Examples of XML <c>Source</c>s include
               <c>javax.xml.transform.stream.StreamSource StreamSource</c>,
               <c>javax.xml.transform.sax.SAXSource SAXSource</c> and
               <c>javax.xml.transform.dom.DOMSource DOMSource</c>.</param>
-        <summary>Process the &lt;code&gt;Source&lt;/code&gt; into a &lt;code&gt;Transformer&lt;/code&gt;
-            &lt;code&gt;Object&lt;/code&gt;.</summary>
-        <returns>A &lt;code&gt;Transformer&lt;/code&gt; object that may be used to perform
-              a transformation in a single &lt;code&gt;Thread&lt;/code&gt;, never
-              &lt;code&gt;null&lt;/code&gt;.</returns>
+        <summary>Process the <c>Source</c> into a <c>Transformer</c><c>Object</c>.</summary>
+        <returns>A <c>Transformer</c> object that may be used to perform
+              a transformation in a single <c>Thread</c>, never
+              <c>null</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -630,9 +630,9 @@
       </Parameters>
       <Docs>
         <param name="name">Feature name.</param>
-        <param name="value">Is feature state &lt;code&gt;true&lt;/code&gt; or &lt;code&gt;false&lt;/code&gt;.</param>
-        <summary>Set a feature for this &lt;code&gt;TransformerFactory&lt;/code&gt; and &lt;code&gt;Transformer&lt;/code&gt;s
-            or &lt;code&gt;Template&lt;/code&gt;s created by this factory.</summary>
+        <param name="value">Is feature state <c>true</c> or <c>false</c>.</param>
+        <summary>Set a feature for this <c>TransformerFactory</c> and <c>Transformer</c>s
+            or <c>Template</c>s created by this factory.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Javax.Xml.Transform/TransformerFactoryConfigurationError.xml b/docs/Mono.Android/en/Javax.Xml.Transform/TransformerFactoryConfigurationError.xml
index 77ac0013f3..9772b5a051 100644
--- a/docs/Mono.Android/en/Javax.Xml.Transform/TransformerFactoryConfigurationError.xml
+++ b/docs/Mono.Android/en/Javax.Xml.Transform/TransformerFactoryConfigurationError.xml
@@ -52,7 +52,7 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <summary>Create a new &lt;code&gt;TransformerFactoryConfigurationError&lt;/code&gt; with no
+        <summary>Create a new <c>TransformerFactoryConfigurationError</c> with no
             detail message.</summary>
         <remarks>
           <para>
@@ -91,8 +91,8 @@
       <Docs>
         <param name="e">The exception to be encapsulated in a
             TransformerFactoryConfigurationError.</param>
-        <summary>Create a new &lt;code&gt;TransformerFactoryConfigurationError&lt;/code&gt; with a
-            given &lt;code&gt;Exception&lt;/code&gt; base cause of the error.</summary>
+        <summary>Create a new <c>TransformerFactoryConfigurationError</c> with a
+            given <c>Exception</c> base cause of the error.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -129,8 +129,8 @@
       </Parameters>
       <Docs>
         <param name="msg">The error message for the exception.</param>
-        <summary>Create a new &lt;code&gt;TransformerFactoryConfigurationError&lt;/code&gt; with
-            the &lt;code&gt;String&lt;/code&gt; specified as an error message.</summary>
+        <summary>Create a new <c>TransformerFactoryConfigurationError</c> with
+            the <c>String</c> specified as an error message.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -170,8 +170,8 @@
         <param name="e">The exception to be encapsulated in a
             TransformerFactoryConfigurationError</param>
         <param name="msg">The detail message.</param>
-        <summary>Create a new &lt;code&gt;TransformerFactoryConfigurationError&lt;/code&gt; with the
-            given &lt;code&gt;Exception&lt;/code&gt; base cause and detail message.</summary>
+        <summary>Create a new <c>TransformerFactoryConfigurationError</c> with the
+            given <c>Exception</c> base cause and detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Javax.Xml.Validation/SchemaFactory.xml b/docs/Mono.Android/en/Javax.Xml.Validation/SchemaFactory.xml
index f78f27add8..c59f051aa7 100644
--- a/docs/Mono.Android/en/Javax.Xml.Validation/SchemaFactory.xml
+++ b/docs/Mono.Android/en/Javax.Xml.Validation/SchemaFactory.xml
@@ -243,10 +243,11 @@
         <Parameter Name="schemaLanguage" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="schemaLanguage">Specifies the schema language which the returned &lt;code&gt;SchemaFactory&lt;/code&gt; will understand.
-               &lt;code&gt;schemaLanguage&lt;/code&gt; must specify a "#schemaLanguage"&gt;valid schema language.</param>
-        <summary>Is specified schema supported by this &lt;code&gt;SchemaFactory&lt;/code&gt;?</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if &lt;code&gt;SchemaFactory&lt;/code&gt; supports &lt;code&gt;schemaLanguage&lt;/code&gt;, else &lt;code&gt;false&lt;/code&gt;.</returns>
+        <param name="schemaLanguage">Specifies the schema language which the returned <c>SchemaFactory</c> will understand.
+               <c>schemaLanguage</c> must specify a "#schemaLanguage"&gt;valid schema language.</param>
+        <summary>Is specified schema supported by this <c>SchemaFactory</c>?</summary>
+        <returns>
+          <c>true</c> if <c>SchemaFactory</c> supports <c>schemaLanguage</c>, else <c>false</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -324,9 +325,9 @@
                  SchemaFactory will understand. See
                  "#schemaLanguage"&gt;the list of available
                  schema languages for the possible values.</param>
-        <summary>Lookup an implementation of the &lt;code&gt;SchemaFactory&lt;/code&gt; that supports the specified
+        <summary>Lookup an implementation of the <c>SchemaFactory</c> that supports the specified
             schema language and return it.</summary>
-        <returns>New instance of a &lt;code&gt;SchemaFactory&lt;/code&gt;</returns>
+        <returns>New instance of a <c>SchemaFactory</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -460,8 +461,8 @@
       </Parameters>
       <Docs>
         <param name="schema">File that represents a schema.</param>
-        <summary>Parses the specified &lt;code&gt;File&lt;/code&gt; as a schema and returns it as a &lt;code&gt;Schema&lt;/code&gt;.</summary>
-        <returns>New &lt;code&gt;Schema&lt;/code&gt; from parsing &lt;code&gt;schema&lt;/code&gt;.</returns>
+        <summary>Parses the specified <c>File</c> as a schema and returns it as a <c>Schema</c>.</summary>
+        <returns>New <c>Schema</c> from parsing <c>schema</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -503,9 +504,10 @@
         <Parameter Name="schema" Type="Java.Net.URL" />
       </Parameters>
       <Docs>
-        <param name="schema">&lt;code&gt;URL&lt;/code&gt; that represents a schema.</param>
-        <summary>Parses the specified &lt;code&gt;URL&lt;/code&gt; as a schema and returns it as a &lt;code&gt;Schema&lt;/code&gt;.</summary>
-        <returns>New &lt;code&gt;Schema&lt;/code&gt; from parsing &lt;code&gt;schema&lt;/code&gt;.</returns>
+        <param name="schema">
+          <c>URL</c> that represents a schema.</param>
+        <summary>Parses the specified <c>URL</c> as a schema and returns it as a <c>Schema</c>.</summary>
+        <returns>New <c>Schema</c> from parsing <c>schema</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -549,7 +551,7 @@
       <Docs>
         <param name="schema">Source that represents a schema.</param>
         <summary>Parses the specified source as a schema and returns it as a schema.</summary>
-        <returns>New &lt;code&gt;Schema&lt;/code&gt; from parsing &lt;code&gt;schema&lt;/code&gt;.</returns>
+        <returns>New <c>Schema</c> from parsing <c>schema</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Javax.Xml.Validation/Validator.xml b/docs/Mono.Android/en/Javax.Xml.Validation/Validator.xml
index 78f9a57247..e5b02ed992 100644
--- a/docs/Mono.Android/en/Javax.Xml.Validation/Validator.xml
+++ b/docs/Mono.Android/en/Javax.Xml.Validation/Validator.xml
@@ -271,7 +271,7 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Reset this &lt;code&gt;Validator&lt;/code&gt; to its original configuration.</summary>
+        <summary>Reset this <c>Validator</c> to its original configuration.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Javax.Xml.Xpath/IXPath.xml b/docs/Mono.Android/en/Javax.Xml.Xpath/IXPath.xml
index d8b9557d91..b77acabd84 100644
--- a/docs/Mono.Android/en/Javax.Xml.Xpath/IXPath.xml
+++ b/docs/Mono.Android/en/Javax.Xml.Xpath/IXPath.xml
@@ -25,7 +25,8 @@
     </Attribute>
   </Attributes>
   <Docs since="8">
-    <summary>&lt;code&gt;XPath&lt;/code&gt; provides access to the XPath evaluation environment and expressions.</summary>
+    <summary>
+      <c>XPath</c> provides access to the XPath evaluation environment and expressions.</summary>
     <remarks>
       <para>
         <format type="text/html">
@@ -111,9 +112,9 @@
       <Docs>
         <param name="expression">The XPath expression.</param>
         <param name="item">The starting context (node or node list, for example).</param>
-        <summary>Evaluate an XPath expression in the specified context and return the result as a &lt;code&gt;String&lt;/code&gt;.</summary>
-        <returns>The &lt;code&gt;String&lt;/code&gt; that is the result of evaluating the expression and
-              converting the result to a &lt;code&gt;String&lt;/code&gt;.</returns>
+        <summary>Evaluate an XPath expression in the specified context and return the result as a <c>String</c>.</summary>
+        <returns>The <c>String</c> that is the result of evaluating the expression and
+              converting the result to a <c>String</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -157,11 +158,11 @@
       </Parameters>
       <Docs>
         <param name="expression">The XPath expression.</param>
-        <param name="source">The &lt;code&gt;InputSource&lt;/code&gt; of the document to evaluate over.</param>
-        <summary>Evaluate an XPath expression in the context of the specified &lt;code&gt;InputSource&lt;/code&gt;
-            and return the result as a &lt;code&gt;String&lt;/code&gt;.</summary>
-        <returns>The &lt;code&gt;String&lt;/code&gt; that is the result of evaluating the expression and
-              converting the result to a &lt;code&gt;String&lt;/code&gt;.</returns>
+        <param name="source">The <c>InputSource</c> of the document to evaluate over.</param>
+        <summary>Evaluate an XPath expression in the context of the specified <c>InputSource</c>
+            and return the result as a <c>String</c>.</summary>
+        <returns>The <c>String</c> that is the result of evaluating the expression and
+              converting the result to a <c>String</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -208,8 +209,8 @@
         <param name="expression">The XPath expression.</param>
         <param name="item">The starting context (node or node list, for example).</param>
         <param name="returnType">The desired return type.</param>
-        <summary>Evaluate an &lt;code&gt;XPath&lt;/code&gt; expression in the specified context and return the result as the specified type.</summary>
-        <returns>Result of evaluating an XPath expression as an &lt;code&gt;Object&lt;/code&gt; of &lt;code&gt;returnType&lt;/code&gt;.</returns>
+        <summary>Evaluate an <c>XPath</c> expression in the specified context and return the result as the specified type.</summary>
+        <returns>Result of evaluating an XPath expression as an <c>Object</c> of <c>returnType</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -257,9 +258,9 @@
         <param name="expression">The XPath expression.</param>
         <param name="source">The input source of the document to evaluate over.</param>
         <param name="returnType">The desired return type.</param>
-        <summary>Evaluate an XPath expression in the context of the specified &lt;code&gt;InputSource&lt;/code&gt;
+        <summary>Evaluate an XPath expression in the context of the specified <c>InputSource</c>
             and return the result as the specified type.</summary>
-        <returns>The &lt;code&gt;Object&lt;/code&gt; that encapsulates the result of evaluating the expression.</returns>
+        <returns>The <c>Object</c> that encapsulates the result of evaluating the expression.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -346,7 +347,7 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Reset this &lt;code&gt;XPath&lt;/code&gt; to its original configuration.</summary>
+        <summary>Reset this <c>XPath</c> to its original configuration.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Javax.Xml.Xpath/IXPathExpression.xml b/docs/Mono.Android/en/Javax.Xml.Xpath/IXPathExpression.xml
index 6630a71c60..17315ad697 100644
--- a/docs/Mono.Android/en/Javax.Xml.Xpath/IXPathExpression.xml
+++ b/docs/Mono.Android/en/Javax.Xml.Xpath/IXPathExpression.xml
@@ -25,7 +25,8 @@
     </Attribute>
   </Attributes>
   <Docs since="8">
-    <summary>&lt;code&gt;XPathExpression&lt;/code&gt; provides access to compiled XPath expressions.</summary>
+    <summary>
+      <c>XPathExpression</c> provides access to compiled XPath expressions.</summary>
     <remarks>
       <para>
         <format type="text/html">
@@ -65,9 +66,9 @@
       </Parameters>
       <Docs>
         <param name="item">The starting context (node or node list, for example).</param>
-        <summary>Evaluate the compiled XPath expression in the specified context and return the result as a &lt;code&gt;String&lt;/code&gt;.</summary>
-        <returns>The &lt;code&gt;String&lt;/code&gt; that is the result of evaluating the expression and converting the result to a
-              &lt;code&gt;String&lt;/code&gt;.</returns>
+        <summary>Evaluate the compiled XPath expression in the specified context and return the result as a <c>String</c>.</summary>
+        <returns>The <c>String</c> that is the result of evaluating the expression and converting the result to a
+              <c>String</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -108,11 +109,11 @@
         <Parameter Name="source" Type="Org.Xml.Sax.InputSource" />
       </Parameters>
       <Docs>
-        <param name="source">The &lt;code&gt;InputSource&lt;/code&gt; of the document to evaluate over.</param>
-        <summary>Evaluate the compiled XPath expression in the context of the specified &lt;code&gt;InputSource&lt;/code&gt; and return the result as a
-            &lt;code&gt;String&lt;/code&gt;.</summary>
-        <returns>The &lt;code&gt;String&lt;/code&gt; that is the result of evaluating the expression and converting the result to a
-              &lt;code&gt;String&lt;/code&gt;.</returns>
+        <param name="source">The <c>InputSource</c> of the document to evaluate over.</param>
+        <summary>Evaluate the compiled XPath expression in the context of the specified <c>InputSource</c> and return the result as a
+            <c>String</c>.</summary>
+        <returns>The <c>String</c> that is the result of evaluating the expression and converting the result to a
+              <c>String</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -158,8 +159,8 @@
         <param name="item">The starting context (node or node list, for example).</param>
         <param name="returnType">The desired return type.</param>
         <summary>Evaluate the compiled XPath expression in the specified context and return the result as the specified type.</summary>
-        <returns>The &lt;code&gt;Object&lt;/code&gt; that is the result of evaluating the expression and converting the result to
-              &lt;code&gt;returnType&lt;/code&gt;.</returns>
+        <returns>The <c>Object</c> that is the result of evaluating the expression and converting the result to
+              <c>returnType</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -203,12 +204,12 @@
         <Parameter Name="returnType" Type="Javax.Xml.Namespace.QName" />
       </Parameters>
       <Docs>
-        <param name="source">The &lt;code&gt;InputSource&lt;/code&gt; of the document to evaluate over.</param>
+        <param name="source">The <c>InputSource</c> of the document to evaluate over.</param>
         <param name="returnType">The desired return type.</param>
-        <summary>Evaluate the compiled XPath expression in the context of the specified &lt;code&gt;InputSource&lt;/code&gt; and return the result as the
+        <summary>Evaluate the compiled XPath expression in the context of the specified <c>InputSource</c> and return the result as the
             specified type.</summary>
-        <returns>The &lt;code&gt;Object&lt;/code&gt; that is the result of evaluating the expression and converting the result to
-              &lt;code&gt;returnType&lt;/code&gt;.</returns>
+        <returns>The <c>Object</c> that is the result of evaluating the expression and converting the result to
+              <c>returnType</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Javax.Xml.Xpath/IXPathFunction.xml b/docs/Mono.Android/en/Javax.Xml.Xpath/IXPathFunction.xml
index 76e9ad993d..31cdcaeed9 100644
--- a/docs/Mono.Android/en/Javax.Xml.Xpath/IXPathFunction.xml
+++ b/docs/Mono.Android/en/Javax.Xml.Xpath/IXPathFunction.xml
@@ -25,7 +25,8 @@
     </Attribute>
   </Attributes>
   <Docs since="8">
-    <summary>&lt;code&gt;XPathFunction&lt;/code&gt; provides access to XPath functions.</summary>
+    <summary>
+      <c>XPathFunction</c> provides access to XPath functions.</summary>
     <remarks>
       <para>
         <format type="text/html">
@@ -64,9 +65,9 @@
         <Parameter Name="args" Type="System.Collections.IList" />
       </Parameters>
       <Docs>
-        <param name="args">The arguments, &lt;code&gt;null&lt;/code&gt; is a valid value.</param>
+        <param name="args">The arguments, <c>null</c> is a valid value.</param>
         <summary>Evaluate the function with the specified arguments.</summary>
-        <returns>The result of evaluating the &lt;code&gt;XPath&lt;/code&gt; function as an &lt;code&gt;Object&lt;/code&gt;.</returns>
+        <returns>The result of evaluating the <c>XPath</c> function as an <c>Object</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Javax.Xml.Xpath/IXPathFunctionResolver.xml b/docs/Mono.Android/en/Javax.Xml.Xpath/IXPathFunctionResolver.xml
index e21f8bc7de..54443ae81a 100644
--- a/docs/Mono.Android/en/Javax.Xml.Xpath/IXPathFunctionResolver.xml
+++ b/docs/Mono.Android/en/Javax.Xml.Xpath/IXPathFunctionResolver.xml
@@ -25,7 +25,8 @@
     </Attribute>
   </Attributes>
   <Docs since="8">
-    <summary>&lt;code&gt;XPathFunctionResolver&lt;/code&gt; provides access to the set of user defined &lt;code&gt;XPathFunction&lt;/code&gt;s.</summary>
+    <summary>
+      <c>XPathFunctionResolver</c> provides access to the set of user defined <c>XPathFunction</c>s.</summary>
     <remarks>
       <para>
         <format type="text/html">
@@ -68,7 +69,7 @@
         <param name="functionName">The function name.</param>
         <param name="arity">The number of arguments that the returned function must accept.</param>
         <summary>Find a function in the set of available functions.</summary>
-        <returns>The function or &lt;code&gt;null&lt;/code&gt; if no function named &lt;code&gt;functionName&lt;/code&gt; with &lt;code&gt;arity&lt;/code&gt; arguments exists.</returns>
+        <returns>The function or <c>null</c> if no function named <c>functionName</c> with <c>arity</c> arguments exists.</returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Javax.Xml.Xpath/IXPathVariableResolver.xml b/docs/Mono.Android/en/Javax.Xml.Xpath/IXPathVariableResolver.xml
index 3705ba779b..1b12dfd482 100644
--- a/docs/Mono.Android/en/Javax.Xml.Xpath/IXPathVariableResolver.xml
+++ b/docs/Mono.Android/en/Javax.Xml.Xpath/IXPathVariableResolver.xml
@@ -25,7 +25,8 @@
     </Attribute>
   </Attributes>
   <Docs since="8">
-    <summary>&lt;code&gt;XPathVariableResolver&lt;/code&gt; provides access to the set of user defined XPath variables.</summary>
+    <summary>
+      <c>XPathVariableResolver</c> provides access to the set of user defined XPath variables.</summary>
     <remarks>
       <para>
         <format type="text/html">
@@ -64,9 +65,9 @@
         <Parameter Name="variableName" Type="Javax.Xml.Namespace.QName" />
       </Parameters>
       <Docs>
-        <param name="variableName">The &lt;code&gt;QName&lt;/code&gt; of the variable name.</param>
+        <param name="variableName">The <c>QName</c> of the variable name.</param>
         <summary>Find a variable in the set of available variables.</summary>
-        <returns>The variables value, or &lt;code&gt;null&lt;/code&gt; if no variable named &lt;code&gt;variableName&lt;/code&gt;
+        <returns>The variables value, or <c>null</c> if no variable named <c>variableName</c>
               exists.  The value returned must be of a type appropriate for the underlying object model.</returns>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Xml.Xpath/XPathException.xml b/docs/Mono.Android/en/Javax.Xml.Xpath/XPathException.xml
index 5cc318e45f..dbb59a5e16 100644
--- a/docs/Mono.Android/en/Javax.Xml.Xpath/XPathException.xml
+++ b/docs/Mono.Android/en/Javax.Xml.Xpath/XPathException.xml
@@ -18,7 +18,8 @@
     </Attribute>
   </Attributes>
   <Docs since="8">
-    <summary>&lt;code&gt;XPathException&lt;/code&gt; represents a generic XPath exception.</summary>
+    <summary>
+      <c>XPathException</c> represents a generic XPath exception.</summary>
     <remarks>
       <para>
         <format type="text/html">
@@ -55,7 +56,7 @@
       </Parameters>
       <Docs>
         <param name="cause">The cause.</param>
-        <summary>Constructs a new &lt;code&gt;XPathException&lt;/code&gt; with the specified &lt;code&gt;cause&lt;/code&gt;.</summary>
+        <summary>Constructs a new <c>XPathException</c> with the specified <c>cause</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -94,7 +95,7 @@
       </Parameters>
       <Docs>
         <param name="message">The detail message.</param>
-        <summary>Constructs a new &lt;code&gt;XPathException&lt;/code&gt; with the specified detail &lt;code&gt;message&lt;/code&gt;.</summary>
+        <summary>Constructs a new <c>XPathException</c> with the specified detail <c>message</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Javax.Xml.Xpath/XPathExpressionException.xml b/docs/Mono.Android/en/Javax.Xml.Xpath/XPathExpressionException.xml
index 8b3eb11a11..b291b31044 100644
--- a/docs/Mono.Android/en/Javax.Xml.Xpath/XPathExpressionException.xml
+++ b/docs/Mono.Android/en/Javax.Xml.Xpath/XPathExpressionException.xml
@@ -18,7 +18,8 @@
     </Attribute>
   </Attributes>
   <Docs since="8">
-    <summary>&lt;code&gt;XPathExpressionException&lt;/code&gt; represents an error in an XPath expression.</summary>
+    <summary>
+      <c>XPathExpressionException</c> represents an error in an XPath expression.</summary>
     <remarks>
       <para>
         <format type="text/html">
@@ -55,7 +56,7 @@
       </Parameters>
       <Docs>
         <param name="cause">The cause.</param>
-        <summary>Constructs a new &lt;code&gt;XPathExpressionException&lt;/code&gt; with the specified &lt;code&gt;cause&lt;/code&gt;.</summary>
+        <summary>Constructs a new <c>XPathExpressionException</c> with the specified <c>cause</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -94,7 +95,7 @@
       </Parameters>
       <Docs>
         <param name="message">The detail message.</param>
-        <summary>Constructs a new &lt;code&gt;XPathExpressionException&lt;/code&gt; with the specified detail &lt;code&gt;message&lt;/code&gt;.</summary>
+        <summary>Constructs a new <c>XPathExpressionException</c> with the specified detail <c>message</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Javax.Xml.Xpath/XPathFactory.xml b/docs/Mono.Android/en/Javax.Xml.Xpath/XPathFactory.xml
index 43089c0e9e..732eb81f2a 100644
--- a/docs/Mono.Android/en/Javax.Xml.Xpath/XPathFactory.xml
+++ b/docs/Mono.Android/en/Javax.Xml.Xpath/XPathFactory.xml
@@ -18,7 +18,7 @@
     </Attribute>
   </Attributes>
   <Docs since="8">
-    <summary>An &lt;code&gt;XPathFactory&lt;/code&gt; instance can be used to create
+    <summary>An <c>XPathFactory</c> instance can be used to create
             <c>javax.xml.xpath.XPath</c> objects.</summary>
     <remarks>
       <para>
@@ -54,7 +54,7 @@
       <Docs>
         <summary>Protected constructor as <c>#newInstance()</c>, <c>#newInstance(String uri)</c>
             or <c>#newInstance(String uri, String factoryClassName, ClassLoader classLoader)</c>
-            should be used to create a new instance of an &lt;code&gt;XPathFactory&lt;/code&gt;.</summary>
+            should be used to create a new instance of an <c>XPathFactory</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -233,9 +233,10 @@
         <Parameter Name="objectModel" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="objectModel">Specifies the object model which the returned &lt;code&gt;XPathFactory&lt;/code&gt; will understand.</param>
-        <summary>Is specified object model supported by this &lt;code&gt;XPathFactory&lt;/code&gt;?</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if &lt;code&gt;XPathFactory&lt;/code&gt; supports &lt;code&gt;objectModel&lt;/code&gt;, else &lt;code&gt;false&lt;/code&gt;.</returns>
+        <param name="objectModel">Specifies the object model which the returned <c>XPathFactory</c> will understand.</param>
+        <summary>Is specified object model supported by this <c>XPathFactory</c>?</summary>
+        <returns>
+          <c>true</c> if <c>XPathFactory</c> supports <c>objectModel</c>, else <c>false</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -306,10 +307,10 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Get a new &lt;code&gt;XPathFactory&lt;/code&gt; instance using the default object model,
+        <summary>Get a new <c>XPathFactory</c> instance using the default object model,
             <c>#DEFAULT_OBJECT_MODEL_URI</c>,
             the W3C DOM.</summary>
-        <returns>Instance of an &lt;code&gt;XPathFactory&lt;/code&gt;.</returns>
+        <returns>Instance of an <c>XPathFactory</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -350,10 +351,10 @@
       <Docs>
         <param name="uri">Identifies the underlying object model.
               The specification only defines the URI <c>#DEFAULT_OBJECT_MODEL_URI</c>,
-              &lt;code&gt;http://java.sun.com/jaxp/xpath/dom&lt;/code&gt; for the W3C DOM,
+              <c>http://java.sun.com/jaxp/xpath/dom</c> for the W3C DOM,
               the org.w3c.dom package, and implementations are free to introduce other URIs for other object models.</param>
-        <summary>Get a new &lt;code&gt;XPathFactory&lt;/code&gt; instance using the specified object model.</summary>
-        <returns>Instance of an &lt;code&gt;XPathFactory&lt;/code&gt;.</returns>
+        <summary>Get a new <c>XPathFactory</c> instance using the specified object model.</summary>
+        <returns>Instance of an <c>XPathFactory</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -404,7 +405,7 @@
         <summary>Get a new &lt;code&gt;XPathFactory&lt;/code&gt; instance using the default object model,
             <c>#DEFAULT_OBJECT_MODEL_URI</c>,
             the W3C DOM.</summary>
-        <returns>Instance of an &lt;code&gt;XPathFactory&lt;/code&gt;.</returns>
+        <returns>Instance of an <c>XPathFactory</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -445,9 +446,9 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Return a new &lt;code&gt;XPath&lt;/code&gt; using the underlying object
-            model determined when the &lt;code&gt;XPathFactory&lt;/code&gt; was instantiated.</summary>
-        <returns>New instance of an &lt;code&gt;XPath&lt;/code&gt;.</returns>
+        <summary>Return a new <c>XPath</c> using the underlying object
+            model determined when the <c>XPathFactory</c> was instantiated.</summary>
+        <returns>New instance of an <c>XPath</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -488,8 +489,8 @@
       </Parameters>
       <Docs>
         <param name="name">Feature name.</param>
-        <param name="value">Is feature state &lt;code&gt;true&lt;/code&gt; or &lt;code&gt;false&lt;/code&gt;.</param>
-        <summary>Set a feature for this &lt;code&gt;XPathFactory&lt;/code&gt; and &lt;code&gt;XPath&lt;/code&gt;s created by this factory.</summary>
+        <param name="value">Is feature state <c>true</c> or <c>false</c>.</param>
+        <summary>Set a feature for this <c>XPathFactory</c> and <c>XPath</c>s created by this factory.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Javax.Xml.Xpath/XPathFactoryConfigurationException.xml b/docs/Mono.Android/en/Javax.Xml.Xpath/XPathFactoryConfigurationException.xml
index 5f3cd79057..034858e445 100644
--- a/docs/Mono.Android/en/Javax.Xml.Xpath/XPathFactoryConfigurationException.xml
+++ b/docs/Mono.Android/en/Javax.Xml.Xpath/XPathFactoryConfigurationException.xml
@@ -18,7 +18,8 @@
     </Attribute>
   </Attributes>
   <Docs since="8">
-    <summary>&lt;code&gt;XPathFactoryConfigurationException&lt;/code&gt; represents a configuration error in a &lt;code&gt;XPathFactory&lt;/code&gt; environment.</summary>
+    <summary>
+      <c>XPathFactoryConfigurationException</c> represents a configuration error in a <c>XPathFactory</c> environment.</summary>
     <remarks>
       <para>
         <format type="text/html">
@@ -55,7 +56,7 @@
       </Parameters>
       <Docs>
         <param name="cause">The cause.</param>
-        <summary>Constructs a new &lt;code&gt;XPathFactoryConfigurationException&lt;/code&gt; with the specified &lt;code&gt;cause&lt;/code&gt;.</summary>
+        <summary>Constructs a new <c>XPathFactoryConfigurationException</c> with the specified <c>cause</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -94,7 +95,7 @@
       </Parameters>
       <Docs>
         <param name="message">The detail message.</param>
-        <summary>Constructs a new &lt;code&gt;XPathFactoryConfigurationException&lt;/code&gt; with the specified detail &lt;code&gt;message&lt;/code&gt;.</summary>
+        <summary>Constructs a new <c>XPathFactoryConfigurationException</c> with the specified detail <c>message</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Javax.Xml.Xpath/XPathFunctionException.xml b/docs/Mono.Android/en/Javax.Xml.Xpath/XPathFunctionException.xml
index 41bf47589d..ca236be3ba 100644
--- a/docs/Mono.Android/en/Javax.Xml.Xpath/XPathFunctionException.xml
+++ b/docs/Mono.Android/en/Javax.Xml.Xpath/XPathFunctionException.xml
@@ -18,7 +18,8 @@
     </Attribute>
   </Attributes>
   <Docs since="8">
-    <summary>&lt;code&gt;XPathFunctionException&lt;/code&gt; represents an error with an XPath function.</summary>
+    <summary>
+      <c>XPathFunctionException</c> represents an error with an XPath function.</summary>
     <remarks>
       <para>
         <format type="text/html">
@@ -55,7 +56,7 @@
       </Parameters>
       <Docs>
         <param name="cause">The cause.</param>
-        <summary>Constructs a new &lt;code&gt;XPathFunctionException&lt;/code&gt; with the specified &lt;code&gt;cause&lt;/code&gt;.</summary>
+        <summary>Constructs a new <c>XPathFunctionException</c> with the specified <c>cause</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -94,7 +95,7 @@
       </Parameters>
       <Docs>
         <param name="message">The detail message.</param>
-        <summary>Constructs a new &lt;code&gt;XPathFunctionException&lt;/code&gt; with the specified detail &lt;code&gt;message&lt;/code&gt;.</summary>
+        <summary>Constructs a new <c>XPathFunctionException</c> with the specified detail <c>message</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Org.Apache.Http.Conn.Schemes/ISocketFactory.xml b/docs/Mono.Android/en/Org.Apache.Http.Conn.Schemes/ISocketFactory.xml
index ca645d4c99..934faa2137 100644
--- a/docs/Mono.Android/en/Org.Apache.Http.Conn.Schemes/ISocketFactory.xml
+++ b/docs/Mono.Android/en/Org.Apache.Http.Conn.Schemes/ISocketFactory.xml
@@ -79,18 +79,18 @@
       <Docs>
         <param name="sock">the socket to connect, as obtained from
                              <c>#createSocket createSocket</c>.
-                             &lt;code&gt;null&lt;/code&gt; indicates that a new socket
+                             <c>null</c> indicates that a new socket
                              should be created and connected.</param>
         <param name="host">the host to connect to</param>
         <param name="port">the port to connect to on the host</param>
         <param name="localAddress">the local address to bind the socket to, or
-                             &lt;code&gt;null&lt;/code&gt; for any</param>
+                             <c>null</c> for any</param>
         <param name="localPort">the port on the local machine,
                              0 or a negative number for any</param>
         <param name="params">additional <c>HttpParams parameters</c> for connecting</param>
         <summary>Connects a socket to the given host.</summary>
         <returns>the connected socket. The returned object may be different
-                     from the &lt;code&gt;sock&lt;/code&gt; argument if this factory supports
+                     from the <c>sock</c> argument if this factory supports
                      a layered protocol.</returns>
         <remarks>
           <para>
@@ -185,9 +185,10 @@
       <Docs>
         <param name="sock">the connected socket to check</param>
         <summary>Checks whether a socket provides a secure connection.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if the connection of the socket
+        <returns>
+          <c>true</c> if the connection of the socket
                      should be considered secure, or
-                     &lt;code&gt;false&lt;/code&gt; if it should not</returns>
+                     <c>false</c> if it should not</returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Org.Apache.Http.Conn.Ssl/SSLSocketFactory.xml b/docs/Mono.Android/en/Org.Apache.Http.Conn.Ssl/SSLSocketFactory.xml
index a7e3ca7150..4631122faa 100644
--- a/docs/Mono.Android/en/Org.Apache.Http.Conn.Ssl/SSLSocketFactory.xml
+++ b/docs/Mono.Android/en/Org.Apache.Http.Conn.Ssl/SSLSocketFactory.xml
@@ -637,7 +637,9 @@
       <Docs>
         <param name="sock">the connected socket</param>
         <summary>Checks whether a socket connection is secure.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt;</returns>
+        <returns>
+          <c>true</c>
+        </returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Org.Apache.Http.Params/AbstractHttpParams.xml b/docs/Mono.Android/en/Org.Apache.Http.Params/AbstractHttpParams.xml
index f84c8e8648..a0604f9f11 100644
--- a/docs/Mono.Android/en/Org.Apache.Http.Params/AbstractHttpParams.xml
+++ b/docs/Mono.Android/en/Org.Apache.Http.Params/AbstractHttpParams.xml
@@ -319,8 +319,8 @@
         <param name="name">the parent name.</param>
         <summary>Obtains the value of the given parameter.</summary>
         <returns>an object that represents the value of the parameter,
-                     &lt;code&gt;null&lt;/code&gt; if the parameter is not set or if it
-                     is explicitly set to &lt;code&gt;null&lt;/code&gt;</returns>
+                     <c>null</c> if the parameter is not set or if it
+                     is explicitly set to <c>null</c></returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Org.Apache.Http.Params/IHttpParams.xml b/docs/Mono.Android/en/Org.Apache.Http.Params/IHttpParams.xml
index 001f5ba5bd..92ab96221f 100644
--- a/docs/Mono.Android/en/Org.Apache.Http.Params/IHttpParams.xml
+++ b/docs/Mono.Android/en/Org.Apache.Http.Params/IHttpParams.xml
@@ -309,8 +309,8 @@
         <param name="name">the parent name.</param>
         <summary>Obtains the value of the given parameter.</summary>
         <returns>an object that represents the value of the parameter,
-                     &lt;code&gt;null&lt;/code&gt; if the parameter is not set or if it
-                     is explicitly set to &lt;code&gt;null&lt;/code&gt;</returns>
+                     <c>null</c> if the parameter is not set or if it
+                     is explicitly set to <c>null</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -355,11 +355,11 @@
       </Parameters>
       <Docs>
         <param name="name">parameter name</param>
-        <summary>Checks if a boolean parameter is not set or &lt;code&gt;false&lt;/code&gt;.</summary>
+        <summary>Checks if a boolean parameter is not set or <c>false</c>.</summary>
         <returns>
           <c>true</c> if the parameter is either not set or
                     set to value <c>false</c>,
-                    <c>false</c> if it is set to &lt;code&gt;true&lt;/code&gt;</returns>
+                    <c>false</c> if it is set to <c>true</c></returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -403,10 +403,10 @@
       </Parameters>
       <Docs>
         <param name="name">parameter name</param>
-        <summary>Checks if a boolean parameter is set to &lt;code&gt;true&lt;/code&gt;.</summary>
+        <summary>Checks if a boolean parameter is set to <c>true</c>.</summary>
         <returns>
           <c>true</c> if the parameter is set to value <c>true</c>,
-                    <c>false</c> if it is not set or set to &lt;code&gt;false&lt;/code&gt;</returns>
+                    <c>false</c> if it is not set or set to <c>false</c></returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Org.W3c.Dom.LS/DOMImplementationLS.xml b/docs/Mono.Android/en/Org.W3c.Dom.LS/DOMImplementationLS.xml
index bafc5d0eb7..32b9741087 100644
--- a/docs/Mono.Android/en/Org.W3c.Dom.LS/DOMImplementationLS.xml
+++ b/docs/Mono.Android/en/Org.W3c.Dom.LS/DOMImplementationLS.xml
@@ -58,7 +58,7 @@
       </ReturnValue>
       <MemberValue>2</MemberValue>
       <Docs>
-        <summary>Create an asynchronous &lt;code&gt;LSParser&lt;/code&gt;.</summary>
+        <summary>Create an asynchronous <c>LSParser</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -98,7 +98,7 @@
       </ReturnValue>
       <MemberValue>1</MemberValue>
       <Docs>
-        <summary>Create a synchronous &lt;code&gt;LSParser&lt;/code&gt;.</summary>
+        <summary>Create a synchronous <c>LSParser</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Org.W3c.Dom.LS/IDOMImplementationLS.xml b/docs/Mono.Android/en/Org.W3c.Dom.LS/IDOMImplementationLS.xml
index f1c311c6b1..0946d5793b 100644
--- a/docs/Mono.Android/en/Org.W3c.Dom.LS/IDOMImplementationLS.xml
+++ b/docs/Mono.Android/en/Org.W3c.Dom.LS/IDOMImplementationLS.xml
@@ -25,7 +25,8 @@
     </Attribute>
   </Attributes>
   <Docs>
-    <summary>&lt;code&gt;DOMImplementationLS&lt;/code&gt; contains the factory methods for creating
+    <summary>
+      <c>DOMImplementationLS</c> contains the factory methods for creating
             Load and Save objects.</summary>
     <remarks>
       <para>
@@ -63,7 +64,11 @@
       <Parameters />
       <Docs>
         <summary>Create a new empty input source object where
-            &lt;code&gt;LSInput.</summary>
+            <c>LSInput.characterStream</c>, <c>LSInput.byteStream</c>
+            , <c>LSInput.stringData</c><c>LSInput.systemId</c>,
+            <c>LSInput.publicId</c>, <c>LSInput.baseURI</c>, and
+            <c>LSInput.encoding</c> are null, and
+            <c>LSInput.certifiedText</c> is false.</summary>
         <returns>The newly created input object.</returns>
         <remarks>
           <para>
@@ -101,7 +106,9 @@
       <Parameters />
       <Docs>
         <summary>Create a new empty output destination object where
-            &lt;code&gt;LSOutput.</summary>
+            <c>LSOutput.characterStream</c>,
+            <c>LSOutput.byteStream</c>, <c>LSOutput.systemId</c>,
+            <c>LSOutput.encoding</c> are null.</summary>
         <returns>The newly created output object.</returns>
         <remarks>
           <para>
@@ -141,38 +148,38 @@
         <Parameter Name="schemaType" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="mode">The &lt;code&gt;mode&lt;/code&gt; argument is either
-              &lt;code&gt;MODE_SYNCHRONOUS&lt;/code&gt; or &lt;code&gt;MODE_ASYNCHRONOUS&lt;/code&gt;, if
-              &lt;code&gt;mode&lt;/code&gt; is &lt;code&gt;MODE_SYNCHRONOUS&lt;/code&gt; then the
-              &lt;code&gt;LSParser&lt;/code&gt; that is created will operate in synchronous
-              mode, if it's &lt;code&gt;MODE_ASYNCHRONOUS&lt;/code&gt; then the
-              &lt;code&gt;LSParser&lt;/code&gt; that is created will operate in asynchronous
+        <param name="mode">The <c>mode</c> argument is either
+              <c>MODE_SYNCHRONOUS</c> or <c>MODE_ASYNCHRONOUS</c>, if
+              <c>mode</c> is <c>MODE_SYNCHRONOUS</c> then the
+              <c>LSParser</c> that is created will operate in synchronous
+              mode, if it's <c>MODE_ASYNCHRONOUS</c> then the
+              <c>LSParser</c> that is created will operate in asynchronous
               mode.</param>
         <param name="schemaType">An absolute URI representing the type of the schema
-              language used during the load of a &lt;code&gt;Document&lt;/code&gt; using the
-              newly created &lt;code&gt;LSParser&lt;/code&gt;. Note that no lexical checking
+              language used during the load of a <c>Document</c> using the
+              newly created <c>LSParser</c>. Note that no lexical checking
               is done on the absolute URI. In order to create a
-              &lt;code&gt;LSParser&lt;/code&gt; for any kind of schema types (i.e. the
+              <c>LSParser</c> for any kind of schema types (i.e. the
               LSParser will be free to use any schema found), use the value
-              &lt;code&gt;null&lt;/code&gt;.
+              <c>null</c>.
             &lt;p &gt;&lt;b&gt;Note:&lt;/b&gt;    For W3C XML Schema [<see href="http://www.w3.org/TR/2001/REC-xmlschema-1-20010502/">XML Schema Part 1</see>]
               , applications must use the value
-              &lt;code&gt;"http://www.w3.org/2001/XMLSchema"&lt;/code&gt;. For XML DTD [<see href="http://www.w3.org/TR/2004/REC-xml-20040204">XML 1.0</see>],
+              <c>"http://www.w3.org/2001/XMLSchema"</c>. For XML DTD [<see href="http://www.w3.org/TR/2004/REC-xml-20040204">XML 1.0</see>],
               applications must use the value
-              &lt;code&gt;"http://www.w3.org/TR/REC-xml"&lt;/code&gt;. Other Schema languages
+              <c>"http://www.w3.org/TR/REC-xml"</c>. Other Schema languages
               are outside the scope of the W3C and therefore should recommend an
               absolute URI in order to use this method.</param>
-        <summary>Create a new &lt;code&gt;LSParser&lt;/code&gt;.</summary>
-        <returns>The newly created &lt;code&gt;LSParser&lt;/code&gt; object. This
-              &lt;code&gt;LSParser&lt;/code&gt; is either synchronous or asynchronous
-              depending on the value of the &lt;code&gt;mode&lt;/code&gt; argument.
-            &lt;p &gt;&lt;b&gt;Note:&lt;/b&gt;    By default, the newly created &lt;code&gt;LSParser&lt;/code&gt;
-              does not contain a &lt;code&gt;DOMErrorHandler&lt;/code&gt;, i.e. the value of
+        <summary>Create a new <c>LSParser</c>.</summary>
+        <returns>The newly created <c>LSParser</c> object. This
+              <c>LSParser</c> is either synchronous or asynchronous
+              depending on the value of the <c>mode</c> argument.
+            &lt;p &gt;&lt;b&gt;Note:&lt;/b&gt;    By default, the newly created <c>LSParser</c>
+              does not contain a <c>DOMErrorHandler</c>, i.e. the value of
               the "<see href="http://www.w3.org/TR/DOM-Level-3-Core/core.html#parameter-error-handler">
-              error-handler</see>" configuration parameter is &lt;code&gt;null&lt;/code&gt;. However, implementations
+              error-handler</see>" configuration parameter is <c>null</c>. However, implementations
               may provide a default error handler at creation time. In that case,
-              the initial value of the &lt;code&gt;"error-handler"&lt;/code&gt; configuration
-              parameter on the new &lt;code&gt;LSParser&lt;/code&gt; object contains a
+              the initial value of the <c>"error-handler"</c> configuration
+              parameter on the new <c>LSParser</c> object contains a
               reference to the default error handler.</returns>
         <remarks>
           <para>
@@ -209,15 +216,15 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Create a new &lt;code&gt;LSSerializer&lt;/code&gt; object.</summary>
-        <returns>The newly created &lt;code&gt;LSSerializer&lt;/code&gt; object.
+        <summary>Create a new <c>LSSerializer</c> object.</summary>
+        <returns>The newly created <c>LSSerializer</c> object.
             &lt;p &gt;&lt;b&gt;Note:&lt;/b&gt;    By default, the newly created
-              &lt;code&gt;LSSerializer&lt;/code&gt; has no &lt;code&gt;DOMErrorHandler&lt;/code&gt;, i.e.
-              the value of the &lt;code&gt;"error-handler"&lt;/code&gt; configuration
-              parameter is &lt;code&gt;null&lt;/code&gt;. However, implementations may
+              <c>LSSerializer</c> has no <c>DOMErrorHandler</c>, i.e.
+              the value of the <c>"error-handler"</c> configuration
+              parameter is <c>null</c>. However, implementations may
               provide a default error handler at creation time. In that case, the
-              initial value of the &lt;code&gt;"error-handler"&lt;/code&gt; configuration
-              parameter on the new &lt;code&gt;LSSerializer&lt;/code&gt; object contains a
+              initial value of the <c>"error-handler"</c> configuration
+              parameter on the new <c>LSSerializer</c> object contains a
               reference to the default error handler.</returns>
         <remarks>
           <para>
@@ -254,7 +261,7 @@
       </ReturnValue>
       <MemberValue>2</MemberValue>
       <Docs>
-        <summary>Create an asynchronous &lt;code&gt;LSParser&lt;/code&gt;.</summary>
+        <summary>Create an asynchronous <c>LSParser</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -290,7 +297,7 @@
       </ReturnValue>
       <MemberValue>1</MemberValue>
       <Docs>
-        <summary>Create a synchronous &lt;code&gt;LSParser&lt;/code&gt;.</summary>
+        <summary>Create a synchronous <c>LSParser</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Org.W3c.Dom.LS/ILSParser.xml b/docs/Mono.Android/en/Org.W3c.Dom.LS/ILSParser.xml
index cb1e935fc8..e1ef381bd0 100644
--- a/docs/Mono.Android/en/Org.W3c.Dom.LS/ILSParser.xml
+++ b/docs/Mono.Android/en/Org.W3c.Dom.LS/ILSParser.xml
@@ -64,7 +64,7 @@
       <Parameters />
       <Docs>
         <summary>Abort the loading of the document that is currently being loaded by
-            the &lt;code&gt;LSParser&lt;/code&gt;.</summary>
+            the <c>LSParser</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -409,14 +409,14 @@
         <Parameter Name="input" Type="Org.W3c.Dom.LS.ILSInput" />
       </Parameters>
       <Docs>
-        <param name="input">The &lt;code&gt;LSInput&lt;/code&gt; from which the source of the
+        <param name="input">The <c>LSInput</c> from which the source of the
               document is to be read.</param>
         <summary>Parse an XML document from a resource identified by a
-            &lt;code&gt;LSInput&lt;/code&gt;.</summary>
-        <returns>If the &lt;code&gt;LSParser&lt;/code&gt; is a synchronous
-              &lt;code&gt;LSParser&lt;/code&gt;, the newly created and populated
-              &lt;code&gt;Document&lt;/code&gt; is returned. If the &lt;code&gt;LSParser&lt;/code&gt; is
-              asynchronous, &lt;code&gt;null&lt;/code&gt; is returned since the document
+            <c>LSInput</c>.</summary>
+        <returns>If the <c>LSParser</c> is a synchronous
+              <c>LSParser</c>, the newly created and populated
+              <c>Document</c> is returned. If the <c>LSParser</c> is
+              asynchronous, <c>null</c> is returned since the document
               object may not yet be constructed when this method returns.</returns>
         <remarks>
           <para>
@@ -464,11 +464,11 @@
       <Docs>
         <param name="uri">The location of the XML document to be read.</param>
         <summary>Parse an XML document from a location identified by a URI reference [<see href="http://www.ietf.org/rfc/rfc2396.txt">IETF RFC 2396</see>].</summary>
-        <returns>If the &lt;code&gt;LSParser&lt;/code&gt; is a synchronous
-              &lt;code&gt;LSParser&lt;/code&gt;, the newly created and populated
-              &lt;code&gt;Document&lt;/code&gt; is returned, or &lt;code&gt;null&lt;/code&gt; if an error
-              occured. If the &lt;code&gt;LSParser&lt;/code&gt; is asynchronous,
-              &lt;code&gt;null&lt;/code&gt; is returned since the document object may not yet
+        <returns>If the <c>LSParser</c> is a synchronous
+              <c>LSParser</c>, the newly created and populated
+              <c>Document</c> is returned, or <c>null</c> if an error
+              occured. If the <c>LSParser</c> is asynchronous,
+              <c>null</c> is returned since the document object may not yet
               be constructed when this method returns.</returns>
         <remarks>
           <para>
@@ -516,26 +516,26 @@
         <Parameter Name="action" Type="System.Int16" />
       </Parameters>
       <Docs>
-        <param name="input">The &lt;code&gt;LSInput&lt;/code&gt; from which the source document
+        <param name="input">The <c>LSInput</c> from which the source document
               is to be read. The source document must be an XML fragment, i.e.
               anything except a complete XML document (except in the case where
-              the context node of type &lt;code&gt;DOCUMENT_NODE&lt;/code&gt;, and the action
-              is &lt;code&gt;ACTION_REPLACE_CHILDREN&lt;/code&gt;), a DOCTYPE (internal
+              the context node of type <c>DOCUMENT_NODE</c>, and the action
+              is <c>ACTION_REPLACE_CHILDREN</c>), a DOCTYPE (internal
               subset), entity declaration(s), notation declaration(s), or XML or
               text declaration(s).</param>
         <param name="contextArg">The node that is used as the context for the data
-              that is being parsed. This node must be a &lt;code&gt;Document&lt;/code&gt;
-              node, a &lt;code&gt;DocumentFragment&lt;/code&gt; node, or a node of a type
-              that is allowed as a child of an &lt;code&gt;Element&lt;/code&gt; node, e.g. it
-              cannot be an &lt;code&gt;Attribute&lt;/code&gt; node.</param>
+              that is being parsed. This node must be a <c>Document</c>
+              node, a <c>DocumentFragment</c> node, or a node of a type
+              that is allowed as a child of an <c>Element</c> node, e.g. it
+              cannot be an <c>Attribute</c> node.</param>
         <param name="action">This parameter describes which action should be taken
               between the new set of nodes being inserted and the existing
               children of the context node. The set of possible actions is
-              defined in &lt;code&gt;ACTION_TYPES&lt;/code&gt; above.</param>
+              defined in <c>ACTION_TYPES</c> above.</param>
         <summary>Parse an XML fragment from a resource identified by a
-            &lt;code&gt;LSInput&lt;/code&gt; and insert the content into an existing document
-            at the position specified with the &lt;code&gt;context&lt;/code&gt; and
-            &lt;code&gt;action&lt;/code&gt; arguments.</summary>
+            <c>LSInput</c> and insert the content into an existing document
+            at the position specified with the <c>context</c> and
+            <c>action</c> arguments.</summary>
         <returns>Return the node that is the result of the parse operation. If
               the result is more than one top-level node, the first one is
               returned.</returns>
diff --git a/docs/Mono.Android/en/Org.W3c.Dom.LS/ILSParserFilter.xml b/docs/Mono.Android/en/Org.W3c.Dom.LS/ILSParserFilter.xml
index 5578e251f7..9d7a08e80a 100644
--- a/docs/Mono.Android/en/Org.W3c.Dom.LS/ILSParserFilter.xml
+++ b/docs/Mono.Android/en/Org.W3c.Dom.LS/ILSParserFilter.xml
@@ -25,7 +25,8 @@
     </Attribute>
   </Attributes>
   <Docs since="8">
-    <summary>&lt;code&gt;LSParserFilter&lt;/code&gt;s provide applications the ability to examine
+    <summary>
+      <c>LSParserFilter</c>s provide applications the ability to examine
             nodes as they are being constructed while parsing.</summary>
     <remarks>
       <para>
@@ -72,22 +73,22 @@
         <summary>This method will be called by the parser at the completion of the
             parsing of each node.</summary>
         <returns>&lt;ul&gt;
-            &lt;li&gt; &lt;code&gt;FILTER_ACCEPT&lt;/code&gt; if this &lt;code&gt;Node&lt;/code&gt; should
+            &lt;li&gt; <c>FILTER_ACCEPT</c> if this <c>Node</c> should
               be included in the DOM document being built.
             &lt;/li&gt;
             &lt;li&gt;
-              &lt;code&gt;FILTER_REJECT&lt;/code&gt; if the &lt;code&gt;Node&lt;/code&gt; and all of its
+              <c>FILTER_REJECT</c> if the <c>Node</c> and all of its
               children should be rejected.
             &lt;/li&gt;
-            &lt;li&gt; &lt;code&gt;FILTER_SKIP&lt;/code&gt; if the
-              &lt;code&gt;Node&lt;/code&gt; should be skipped and the &lt;code&gt;Node&lt;/code&gt;
-              should be replaced by all the children of the &lt;code&gt;Node&lt;/code&gt;.
+            &lt;li&gt; <c>FILTER_SKIP</c> if the
+              <c>Node</c> should be skipped and the <c>Node</c>
+              should be replaced by all the children of the <c>Node</c>.
             &lt;/li&gt;
             &lt;li&gt;
-              &lt;code&gt;FILTER_INTERRUPT&lt;/code&gt; if the filter wants to stop the
+              <c>FILTER_INTERRUPT</c> if the filter wants to stop the
               processing of the document. Interrupting the processing of the
               document does no longer guarantee that the resulting DOM tree is
-              XML well-formed. The &lt;code&gt;Node&lt;/code&gt; is accepted and will be the
+              XML well-formed. The <c>Node</c> is accepted and will be the
               last completely parsed node.
             &lt;/li&gt;
             &lt;/ul&gt;</returns>
@@ -276,26 +277,26 @@
         <param name="elementArg">The newly encountered element. At the time this
               method is called, the element is incomplete - it will have its
               attributes, but no children.</param>
-        <summary>The parser will call this method after each &lt;code&gt;Element&lt;/code&gt; start
+        <summary>The parser will call this method after each <c>Element</c> start
             tag has been scanned, but before the remainder of the
-            &lt;code&gt;Element&lt;/code&gt; is processed.</summary>
+            <c>Element</c> is processed.</summary>
         <returns>&lt;ul&gt;
-            &lt;li&gt; &lt;code&gt;FILTER_ACCEPT&lt;/code&gt; if the &lt;code&gt;Element&lt;/code&gt; should
+            &lt;li&gt; <c>FILTER_ACCEPT</c> if the <c>Element</c> should
               be included in the DOM document being built.
             &lt;/li&gt;
             &lt;li&gt;
-              &lt;code&gt;FILTER_REJECT&lt;/code&gt; if the &lt;code&gt;Element&lt;/code&gt; and all of
+              <c>FILTER_REJECT</c> if the <c>Element</c> and all of
               its children should be rejected.
             &lt;/li&gt;
-            &lt;li&gt; &lt;code&gt;FILTER_SKIP&lt;/code&gt; if the
-              &lt;code&gt;Element&lt;/code&gt; should be skipped. All of its children are
-              inserted in place of the skipped &lt;code&gt;Element&lt;/code&gt; node.
+            &lt;li&gt; <c>FILTER_SKIP</c> if the
+              <c>Element</c> should be skipped. All of its children are
+              inserted in place of the skipped <c>Element</c> node.
             &lt;/li&gt;
             &lt;li&gt;
-              &lt;code&gt;FILTER_INTERRUPT&lt;/code&gt; if the filter wants to stop the
+              <c>FILTER_INTERRUPT</c> if the filter wants to stop the
               processing of the document. Interrupting the processing of the
               document does no longer guarantee that the resulting DOM tree is
-              XML well-formed. The &lt;code&gt;Element&lt;/code&gt; is rejected.
+              XML well-formed. The <c>Element</c> is rejected.
             &lt;/li&gt;
             &lt;/ul&gt; Returning
               any other values will result in unspecified behavior.</returns>
diff --git a/docs/Mono.Android/en/Org.W3c.Dom.LS/ILSResourceResolver.xml b/docs/Mono.Android/en/Org.W3c.Dom.LS/ILSResourceResolver.xml
index d6badb8f9e..3a521f6a60 100644
--- a/docs/Mono.Android/en/Org.W3c.Dom.LS/ILSResourceResolver.xml
+++ b/docs/Mono.Android/en/Org.W3c.Dom.LS/ILSResourceResolver.xml
@@ -25,7 +25,8 @@
     </Attribute>
   </Attributes>
   <Docs since="8">
-    <summary>&lt;code&gt;LSResourceResolver&lt;/code&gt; provides a way for applications to
+    <summary>
+      <c>LSResourceResolver</c> provides a way for applications to
             redirect references to external resources.</summary>
     <remarks>
       <para>
@@ -71,25 +72,25 @@
       <Docs>
         <param name="type">The type of the resource being resolved. For XML [<see href="http://www.w3.org/TR/2004/REC-xml-20040204">XML 1.0</see>] resources
               (i.e. entities), applications must use the value
-              &lt;code&gt;"http://www.w3.org/TR/REC-xml"&lt;/code&gt;. For XML Schema [<see href="http://www.w3.org/TR/2001/REC-xmlschema-1-20010502/">XML Schema Part 1</see>]
+              <c>"http://www.w3.org/TR/REC-xml"</c>. For XML Schema [<see href="http://www.w3.org/TR/2001/REC-xmlschema-1-20010502/">XML Schema Part 1</see>]
               , applications must use the value
-              &lt;code&gt;"http://www.w3.org/2001/XMLSchema"&lt;/code&gt;. Other types of
+              <c>"http://www.w3.org/2001/XMLSchema"</c>. Other types of
               resources are outside the scope of this specification and therefore
               should recommend an absolute URI in order to use this method.</param>
         <param name="namespaceURI">The namespace of the resource being resolved,
               e.g. the target namespace of the XML Schema [<see href="http://www.w3.org/TR/2001/REC-xmlschema-1-20010502/">XML Schema Part 1</see>]
                when resolving XML Schema resources.</param>
         <param name="publicId">The public identifier of the external entity being
-              referenced, or &lt;code&gt;null&lt;/code&gt; if no public identifier was
+              referenced, or <c>null</c> if no public identifier was
               supplied or if the resource is not an entity.</param>
         <param name="systemId">The system identifier, a URI reference [<see href="http://www.ietf.org/rfc/rfc2396.txt">IETF RFC 2396</see>], of the
-              external resource being referenced, or &lt;code&gt;null&lt;/code&gt; if no
+              external resource being referenced, or <c>null</c> if no
               system identifier was supplied.</param>
         <param name="baseURI">The absolute base URI of the resource being parsed, or
-              &lt;code&gt;null&lt;/code&gt; if there is no base URI.</param>
+              <c>null</c> if there is no base URI.</param>
         <summary>Allow the application to resolve external resources.</summary>
-        <returns>A &lt;code&gt;LSInput&lt;/code&gt; object describing the new input
-              source, or &lt;code&gt;null&lt;/code&gt; to request that the parser open a
+        <returns>A <c>LSInput</c> object describing the new input
+              source, or <c>null</c> to request that the parser open a
               regular URI connection to the resource.</returns>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Org.W3c.Dom.LS/ILSSerializer.xml b/docs/Mono.Android/en/Org.W3c.Dom.LS/ILSSerializer.xml
index a1be43627f..6943a0be23 100644
--- a/docs/Mono.Android/en/Org.W3c.Dom.LS/ILSSerializer.xml
+++ b/docs/Mono.Android/en/Org.W3c.Dom.LS/ILSSerializer.xml
@@ -25,7 +25,7 @@
     </Attribute>
   </Attributes>
   <Docs>
-    <summary>A &lt;code&gt;LSSerializer&lt;/code&gt; provides an API for serializing (writing) a
+    <summary>A <c>LSSerializer</c> provides an API for serializing (writing) a
             DOM document out into XML.</summary>
     <remarks>
       <para>
@@ -126,9 +126,9 @@
         <param name="nodeArg">The node to serialize.</param>
         <param name="destination">The destination for the serialized DOM.</param>
         <summary>Serialize the specified node as described above in the general
-            description of the &lt;code&gt;LSSerializer&lt;/code&gt; interface.</summary>
-        <returns>Returns &lt;code&gt;true&lt;/code&gt; if &lt;code&gt;node&lt;/code&gt; was
-              successfully serialized. Return &lt;code&gt;false&lt;/code&gt; in case the
+            description of the <c>LSSerializer</c> interface.</summary>
+        <returns>Returns <c>true</c> if <c>node</c> was
+              successfully serialized. Return <c>false</c> in case the
               normal processing stopped but the implementation kept serializing
               the document; the result of the serialization being implementation
               dependent then.</returns>
@@ -171,7 +171,7 @@
       <Docs>
         <param name="nodeArg">The node to serialize.</param>
         <summary>Serialize the specified node as described above in the general
-            description of the &lt;code&gt;LSSerializer&lt;/code&gt; interface.</summary>
+            description of the <c>LSSerializer</c> interface.</summary>
         <returns>Returns the serialized data.</returns>
         <remarks>
           <para>
@@ -213,9 +213,12 @@
       <Docs>
         <param name="nodeArg">The node to serialize.</param>
         <param name="uri">The URI to write to.</param>
-        <summary>A convenience method that acts as if &lt;code&gt;LSSerializer.</summary>
-        <returns>Returns &lt;code&gt;true&lt;/code&gt; if &lt;code&gt;node&lt;/code&gt; was
-              successfully serialized. Return &lt;code&gt;false&lt;/code&gt; in case the
+        <summary>A convenience method that acts as if <c>LSSerializer.write</c>
+            was called with a <c>LSOutput</c> with no encoding specified
+            and <c>LSOutput.systemId</c> set to the <c>uri</c>
+            argument.</summary>
+        <returns>Returns <c>true</c> if <c>node</c> was
+              successfully serialized. Return <c>false</c> in case the
               normal processing stopped but the implementation kept serializing
               the document; the result of the serialization being implementation
               dependent then.</returns>
diff --git a/docs/Mono.Android/en/Org.W3c.Dom.LS/LSException.xml b/docs/Mono.Android/en/Org.W3c.Dom.LS/LSException.xml
index 67dd473e75..eedc49644e 100644
--- a/docs/Mono.Android/en/Org.W3c.Dom.LS/LSException.xml
+++ b/docs/Mono.Android/en/Org.W3c.Dom.LS/LSException.xml
@@ -18,7 +18,7 @@
     </Attribute>
   </Attributes>
   <Docs since="8">
-    <summary>Parser or write operations may throw an &lt;code&gt;LSException&lt;/code&gt; if the
+    <summary>Parser or write operations may throw an <c>LSException</c> if the
             processing is stopped.</summary>
     <remarks>
       <para>
@@ -171,7 +171,7 @@
       <MemberValue>81</MemberValue>
       <Docs>
         <summary>If an attempt was made to load a document, or an XML Fragment, using
-            &lt;code&gt;LSParser&lt;/code&gt; and the processing has been stopped.</summary>
+            <c>LSParser</c> and the processing has been stopped.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -208,8 +208,8 @@
       </ReturnValue>
       <MemberValue>82</MemberValue>
       <Docs>
-        <summary>If an attempt was made to serialize a &lt;code&gt;Node&lt;/code&gt; using
-            &lt;code&gt;LSSerializer&lt;/code&gt; and the processing has been stopped.</summary>
+        <summary>If an attempt was made to serialize a <c>Node</c> using
+            <c>LSSerializer</c> and the processing has been stopped.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Org.W3c.Dom/DOMError.xml b/docs/Mono.Android/en/Org.W3c.Dom/DOMError.xml
index ee073d8c73..a725582c34 100644
--- a/docs/Mono.Android/en/Org.W3c.Dom/DOMError.xml
+++ b/docs/Mono.Android/en/Org.W3c.Dom/DOMError.xml
@@ -60,7 +60,7 @@
       </ReturnValue>
       <MemberValue>2</MemberValue>
       <Docs>
-        <summary>The severity of the error described by the &lt;code&gt;DOMError&lt;/code&gt; is
+        <summary>The severity of the error described by the <c>DOMError</c> is
             error.</summary>
         <remarks>
           <para>
@@ -102,7 +102,7 @@
       </ReturnValue>
       <MemberValue>3</MemberValue>
       <Docs>
-        <summary>The severity of the error described by the &lt;code&gt;DOMError&lt;/code&gt; is
+        <summary>The severity of the error described by the <c>DOMError</c> is
             fatal error.</summary>
         <remarks>
           <para>
@@ -144,7 +144,7 @@
       </ReturnValue>
       <MemberValue>1</MemberValue>
       <Docs>
-        <summary>The severity of the error described by the &lt;code&gt;DOMError&lt;/code&gt; is
+        <summary>The severity of the error described by the <c>DOMError</c> is
             warning.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Org.W3c.Dom/DOMException.xml b/docs/Mono.Android/en/Org.W3c.Dom/DOMException.xml
index 0589b7245a..f159246802 100644
--- a/docs/Mono.Android/en/Org.W3c.Dom/DOMException.xml
+++ b/docs/Mono.Android/en/Org.W3c.Dom/DOMException.xml
@@ -139,7 +139,7 @@
       <MemberValue>2</MemberValue>
       <Docs>
         <summary>If the specified range of text does not fit into a
-            &lt;code&gt;DOMString&lt;/code&gt;.</summary>
+            <c>DOMString</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -176,7 +176,7 @@
       </ReturnValue>
       <MemberValue>3</MemberValue>
       <Docs>
-        <summary>If any &lt;code&gt;Node&lt;/code&gt; is inserted somewhere it doesn't belong.</summary>
+        <summary>If any <c>Node</c> is inserted somewhere it doesn't belong.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -507,7 +507,7 @@
       </ReturnValue>
       <MemberValue>6</MemberValue>
       <Docs>
-        <summary>If data is specified for a &lt;code&gt;Node&lt;/code&gt; which does not support
+        <summary>If data is specified for a <c>Node</c> which does not support
             data.</summary>
         <remarks>
           <para>
@@ -583,7 +583,7 @@
       </ReturnValue>
       <MemberValue>8</MemberValue>
       <Docs>
-        <summary>If an attempt is made to reference a &lt;code&gt;Node&lt;/code&gt; in a context
+        <summary>If an attempt is made to reference a <c>Node</c> in a context
             where it does not exist.</summary>
         <remarks>
           <para>
@@ -795,8 +795,8 @@
       </ReturnValue>
       <MemberValue>16</MemberValue>
       <Docs>
-        <summary>If a call to a method such as &lt;code&gt;insertBefore&lt;/code&gt; or
-            &lt;code&gt;removeChild&lt;/code&gt; would make the &lt;code&gt;Node&lt;/code&gt; invalid
+        <summary>If a call to a method such as <c>insertBefore</c> or
+            <c>removeChild</c> would make the <c>Node</c> invalid
             with respect to "partial validity", this exception would be raised
             and the operation would not be done.</summary>
         <remarks>
@@ -834,7 +834,7 @@
       </ReturnValue>
       <MemberValue>4</MemberValue>
       <Docs>
-        <summary>If a &lt;code&gt;Node&lt;/code&gt; is used in a different document than the one
+        <summary>If a <c>Node</c> is used in a different document than the one
             that created it (that doesn't support it).</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Org.W3c.Dom/IAttr.xml b/docs/Mono.Android/en/Org.W3c.Dom/IAttr.xml
index 633b1e9f8c..6a44181468 100644
--- a/docs/Mono.Android/en/Org.W3c.Dom/IAttr.xml
+++ b/docs/Mono.Android/en/Org.W3c.Dom/IAttr.xml
@@ -28,8 +28,8 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>The &lt;code&gt;Attr&lt;/code&gt; interface represents an attribute in an
-            &lt;code&gt;Element&lt;/code&gt; object.</summary>
+    <summary>The <c>Attr</c> interface represents an attribute in an
+            <c>Element</c> object.</summary>
     <remarks>
       <para>
         <format type="text/html">
diff --git a/docs/Mono.Android/en/Org.W3c.Dom/ICharacterData.xml b/docs/Mono.Android/en/Org.W3c.Dom/ICharacterData.xml
index d893d1283d..793754e215 100644
--- a/docs/Mono.Android/en/Org.W3c.Dom/ICharacterData.xml
+++ b/docs/Mono.Android/en/Org.W3c.Dom/ICharacterData.xml
@@ -28,7 +28,7 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>The &lt;code&gt;CharacterData&lt;/code&gt; interface extends Node with a set of
+    <summary>The <c>CharacterData</c> interface extends Node with a set of
             attributes and methods for accessing character data in the DOM.</summary>
     <remarks>
       <para>
@@ -68,7 +68,7 @@
         <Parameter Name="arg" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="arg">The &lt;code&gt;DOMString&lt;/code&gt; to append.</param>
+        <param name="arg">The <c>DOMString</c> to append.</param>
         <summary>Append the string to the end of the character data of the node.</summary>
         <remarks>
           <para>
@@ -151,8 +151,8 @@
       <Docs>
         <param name="offset">The offset from which to start removing.</param>
         <param name="count">The number of 16-bit units to delete. If the sum of
-              &lt;code&gt;offset&lt;/code&gt; and &lt;code&gt;count&lt;/code&gt; exceeds
-              &lt;code&gt;length&lt;/code&gt; then all 16-bit units from &lt;code&gt;offset&lt;/code&gt;
+              <c>offset</c> and <c>count</c> exceeds
+              <c>length</c> then all 16-bit units from <c>offset</c>
               to the end of the data are deleted.</param>
         <summary>Remove a range of 16-bit units from the node.</summary>
         <remarks>
@@ -201,7 +201,7 @@
       </Parameters>
       <Docs>
         <param name="offset">The character offset at which to insert.</param>
-        <param name="arg">The &lt;code&gt;DOMString&lt;/code&gt; to insert.</param>
+        <param name="arg">The <c>DOMString</c> to insert.</param>
         <summary>Insert a string at the specified 16-bit unit offset.</summary>
         <remarks>
           <para>
@@ -279,12 +279,12 @@
       <Docs>
         <param name="offset">The offset from which to start replacing.</param>
         <param name="count">The number of 16-bit units to replace. If the sum of
-              &lt;code&gt;offset&lt;/code&gt; and &lt;code&gt;count&lt;/code&gt; exceeds
-              &lt;code&gt;length&lt;/code&gt;, then all 16-bit units to the end of the data
-              are replaced; (i.e., the effect is the same as a &lt;code&gt;remove&lt;/code&gt;
-               method call with the same range, followed by an &lt;code&gt;append&lt;/code&gt;
+              <c>offset</c> and <c>count</c> exceeds
+              <c>length</c>, then all 16-bit units to the end of the data
+              are replaced; (i.e., the effect is the same as a <c>remove</c>
+               method call with the same range, followed by an <c>append</c>
                method invocation).</param>
-        <param name="arg">The &lt;code&gt;DOMString&lt;/code&gt; with which the range must be
+        <param name="arg">The <c>DOMString</c> with which the range must be
               replaced.</param>
         <summary>Replace the characters starting at the specified 16-bit unit offset
             with the specified string.</summary>
@@ -336,8 +336,8 @@
         <param name="offset">Start offset of substring to extract.</param>
         <param name="count">The number of 16-bit units to extract.</param>
         <summary>Extracts a range of data from the node.</summary>
-        <returns>The specified substring. If the sum of &lt;code&gt;offset&lt;/code&gt; and
-              &lt;code&gt;count&lt;/code&gt; exceeds the &lt;code&gt;length&lt;/code&gt;, then all 16-bit
+        <returns>The specified substring. If the sum of <c>offset</c> and
+              <c>count</c> exceeds the <c>length</c>, then all 16-bit
               units to the end of the data are returned.</returns>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Org.W3c.Dom/IComment.xml b/docs/Mono.Android/en/Org.W3c.Dom/IComment.xml
index 47c1502f9d..495b5b7795 100644
--- a/docs/Mono.Android/en/Org.W3c.Dom/IComment.xml
+++ b/docs/Mono.Android/en/Org.W3c.Dom/IComment.xml
@@ -31,7 +31,7 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>This interface inherits from &lt;code&gt;CharacterData&lt;/code&gt; and represents the
+    <summary>This interface inherits from <c>CharacterData</c> and represents the
             content of a comment, i.</summary>
     <remarks>
       <para>
diff --git a/docs/Mono.Android/en/Org.W3c.Dom/IDOMConfiguration.xml b/docs/Mono.Android/en/Org.W3c.Dom/IDOMConfiguration.xml
index 76ec44b1fc..49e8dbf082 100644
--- a/docs/Mono.Android/en/Org.W3c.Dom/IDOMConfiguration.xml
+++ b/docs/Mono.Android/en/Org.W3c.Dom/IDOMConfiguration.xml
@@ -25,7 +25,7 @@
     </Attribute>
   </Attributes>
   <Docs since="8">
-    <summary>The &lt;code&gt;DOMConfiguration&lt;/code&gt; interface represents the configuration
+    <summary>The <c>DOMConfiguration</c> interface represents the configuration
             of a document and maintains a table of recognized parameters.</summary>
     <remarks>
       <para>
@@ -67,11 +67,12 @@
       </Parameters>
       <Docs>
         <param name="name">The name of the parameter to check.</param>
-        <param name="value">An object. if &lt;code&gt;null&lt;/code&gt;, the returned value is
-              &lt;code&gt;true&lt;/code&gt;.</param>
+        <param name="value">An object. if <c>null</c>, the returned value is
+              <c>true</c>.</param>
         <summary>Check if setting a parameter to a specific value is supported.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if the parameter could be successfully set
-              to the specified value, or &lt;code&gt;false&lt;/code&gt; if the parameter is
+        <returns>
+          <c>true</c> if the parameter could be successfully set
+              to the specified value, or <c>false</c> if the parameter is
               not recognized or the requested value is not supported. This does
               not change the current value of the parameter itself.</returns>
         <remarks>
@@ -115,7 +116,7 @@
         <param name="name">The name of the parameter.</param>
         <summary>Return the value of a parameter if known.</summary>
         <returns>The current object associated with the specified parameter or
-              &lt;code&gt;null&lt;/code&gt; if no object has been associated or if the
+              <c>null</c> if no object has been associated or if the
               parameter is not supported.</returns>
         <remarks>
           <para>
@@ -189,12 +190,12 @@
       </Parameters>
       <Docs>
         <param name="name">The name of the parameter to set.</param>
-        <param name="value">The new value or &lt;code&gt;null&lt;/code&gt; if the user wishes to
+        <param name="value">The new value or <c>null</c> if the user wishes to
               unset the parameter. While the type of the value parameter is
-              defined as &lt;code&gt;DOMUserData&lt;/code&gt;, the object type must match the
+              defined as <c>DOMUserData</c>, the object type must match the
               type defined by the definition of the parameter. For example, if
               the parameter is "error-handler", the value must be of type
-              &lt;code&gt;DOMErrorHandler&lt;/code&gt;.</param>
+              <c>DOMErrorHandler</c>.</param>
         <summary>Set the value of a parameter.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Org.W3c.Dom/IDOMError.xml b/docs/Mono.Android/en/Org.W3c.Dom/IDOMError.xml
index 6d3b0a7f3e..7e169c0271 100644
--- a/docs/Mono.Android/en/Org.W3c.Dom/IDOMError.xml
+++ b/docs/Mono.Android/en/Org.W3c.Dom/IDOMError.xml
@@ -25,7 +25,8 @@
     </Attribute>
   </Attributes>
   <Docs since="8">
-    <summary>&lt;code&gt;DOMError&lt;/code&gt; is an interface that describes an error.</summary>
+    <summary>
+      <c>DOMError</c> is an interface that describes an error.</summary>
     <remarks>
       <para>
         <format type="text/html">
@@ -203,7 +204,7 @@
       </ReturnValue>
       <MemberValue>2</MemberValue>
       <Docs>
-        <summary>The severity of the error described by the &lt;code&gt;DOMError&lt;/code&gt; is
+        <summary>The severity of the error described by the <c>DOMError</c> is
             error.</summary>
         <remarks>
           <para>
@@ -240,7 +241,7 @@
       </ReturnValue>
       <MemberValue>3</MemberValue>
       <Docs>
-        <summary>The severity of the error described by the &lt;code&gt;DOMError&lt;/code&gt; is
+        <summary>The severity of the error described by the <c>DOMError</c> is
             fatal error.</summary>
         <remarks>
           <para>
@@ -277,7 +278,7 @@
       </ReturnValue>
       <MemberValue>1</MemberValue>
       <Docs>
-        <summary>The severity of the error described by the &lt;code&gt;DOMError&lt;/code&gt; is
+        <summary>The severity of the error described by the <c>DOMError</c> is
             warning.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Org.W3c.Dom/IDOMErrorHandler.xml b/docs/Mono.Android/en/Org.W3c.Dom/IDOMErrorHandler.xml
index a56854c9f4..3bae20f8c6 100644
--- a/docs/Mono.Android/en/Org.W3c.Dom/IDOMErrorHandler.xml
+++ b/docs/Mono.Android/en/Org.W3c.Dom/IDOMErrorHandler.xml
@@ -25,7 +25,8 @@
     </Attribute>
   </Attributes>
   <Docs since="8">
-    <summary>&lt;code&gt;DOMErrorHandler&lt;/code&gt; is a callback interface that the DOM
+    <summary>
+      <c>DOMErrorHandler</c> is a callback interface that the DOM
             implementation can call when reporting errors that happens while
             processing XML data, or when doing some other processing (e.</summary>
     <remarks>
@@ -68,13 +69,13 @@
       <Docs>
         <param name="error">The error object that describes the error. This object
               may be reused by the DOM implementation across multiple calls to
-              the &lt;code&gt;handleError&lt;/code&gt; method.</param>
+              the <c>handleError</c> method.</param>
         <summary>This method is called on the error handler when an error occurs.</summary>
-        <returns>If the &lt;code&gt;handleError&lt;/code&gt; method returns
-              &lt;code&gt;false&lt;/code&gt;, the DOM implementation should stop the current
-              processing when possible. If the method returns &lt;code&gt;true&lt;/code&gt;,
+        <returns>If the <c>handleError</c> method returns
+              <c>false</c>, the DOM implementation should stop the current
+              processing when possible. If the method returns <c>true</c>,
               the processing may continue depending on
-              &lt;code&gt;DOMError.severity&lt;/code&gt;.</returns>
+              <c>DOMError.severity</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Org.W3c.Dom/IDOMImplementation.xml b/docs/Mono.Android/en/Org.W3c.Dom/IDOMImplementation.xml
index 4168d4780a..4f419c1149 100644
--- a/docs/Mono.Android/en/Org.W3c.Dom/IDOMImplementation.xml
+++ b/docs/Mono.Android/en/Org.W3c.Dom/IDOMImplementation.xml
@@ -25,7 +25,7 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>The &lt;code&gt;DOMImplementation&lt;/code&gt; interface provides a number of methods
+    <summary>The <c>DOMImplementation</c> interface provides a number of methods
             for performing operations that are independent of any particular instance
             of the document object model.</summary>
     <remarks>
@@ -69,19 +69,19 @@
       </Parameters>
       <Docs>
         <param name="namespaceURI">The namespace URI of the document element to
-              create or &lt;code&gt;null&lt;/code&gt;.</param>
+              create or <c>null</c>.</param>
         <param name="qualifiedName">The qualified name of the document element to be
-              created or &lt;code&gt;null&lt;/code&gt;.</param>
-        <param name="doctype">The type of document to be created or &lt;code&gt;null&lt;/code&gt;.
-              When &lt;code&gt;doctype&lt;/code&gt; is not &lt;code&gt;null&lt;/code&gt;, its
-              &lt;code&gt;Node.ownerDocument&lt;/code&gt; attribute is set to the document
+              created or <c>null</c>.</param>
+        <param name="doctype">The type of document to be created or <c>null</c>.
+              When <c>doctype</c> is not <c>null</c>, its
+              <c>Node.ownerDocument</c> attribute is set to the document
               being created.</param>
         <summary>Creates a DOM Document object of the specified type with its document
             element.</summary>
-        <returns>A new &lt;code&gt;Document&lt;/code&gt; object with its document element.
-              If the &lt;code&gt;NamespaceURI&lt;/code&gt;, &lt;code&gt;qualifiedName&lt;/code&gt;, and
-              &lt;code&gt;doctype&lt;/code&gt; are &lt;code&gt;null&lt;/code&gt;, the returned
-              &lt;code&gt;Document&lt;/code&gt; is empty with no document element.</returns>
+        <returns>A new <c>Document</c> object with its document element.
+              If the <c>NamespaceURI</c>, <c>qualifiedName</c>, and
+              <c>doctype</c> are <c>null</c>, the returned
+              <c>Document</c> is empty with no document element.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -144,9 +144,9 @@
               created.</param>
         <param name="publicId">The external subset public identifier.</param>
         <param name="systemId">The external subset system identifier.</param>
-        <summary>Creates an empty &lt;code&gt;DocumentType&lt;/code&gt; node.</summary>
-        <returns>A new &lt;code&gt;DocumentType&lt;/code&gt; node with
-              &lt;code&gt;Node.ownerDocument&lt;/code&gt; set to &lt;code&gt;null&lt;/code&gt;.</returns>
+        <summary>Creates an empty <c>DocumentType</c> node.</summary>
+        <returns>A new <c>DocumentType</c> node with
+              <c>Node.ownerDocument</c> set to <c>null</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -201,14 +201,14 @@
             specialized APIs of the specified feature and version, as specified
             in .</summary>
         <returns>Returns an object which implements the specialized APIs of
-              the specified feature and version, if any, or &lt;code&gt;null&lt;/code&gt; if
+              the specified feature and version, if any, or <c>null</c> if
               there is no object which implements interfaces associated with that
-              feature. If the &lt;code&gt;DOMObject&lt;/code&gt; returned by this method
-              implements the &lt;code&gt;DOMImplementation&lt;/code&gt; interface, it must
-              delegate to the primary core &lt;code&gt;DOMImplementation&lt;/code&gt; and not
+              feature. If the <c>DOMObject</c> returned by this method
+              implements the <c>DOMImplementation</c> interface, it must
+              delegate to the primary core <c>DOMImplementation</c> and not
               return results inconsistent with the primary core
-              &lt;code&gt;DOMImplementation&lt;/code&gt; such as &lt;code&gt;hasFeature&lt;/code&gt;,
-              &lt;code&gt;getFeature&lt;/code&gt;, etc.</returns>
+              <c>DOMImplementation</c> such as <c>hasFeature</c>,
+              <c>getFeature</c>, etc.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -252,8 +252,9 @@
         <param name="version">This is the version number of the feature to test.</param>
         <summary>Test if the DOM implementation implements a specific feature and
             version, as specified in .</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if the feature is implemented in the
-              specified version, &lt;code&gt;false&lt;/code&gt; otherwise.</returns>
+        <returns>
+          <c>true</c> if the feature is implemented in the
+              specified version, <c>false</c> otherwise.</returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Org.W3c.Dom/IDOMImplementationList.xml b/docs/Mono.Android/en/Org.W3c.Dom/IDOMImplementationList.xml
index bbb490e8c3..2310e9883f 100644
--- a/docs/Mono.Android/en/Org.W3c.Dom/IDOMImplementationList.xml
+++ b/docs/Mono.Android/en/Org.W3c.Dom/IDOMImplementationList.xml
@@ -25,7 +25,7 @@
     </Attribute>
   </Attributes>
   <Docs since="8">
-    <summary>The &lt;code&gt;DOMImplementationList&lt;/code&gt; interface provides the abstraction
+    <summary>The <c>DOMImplementationList</c> interface provides the abstraction
             of an ordered collection of DOM implementations, without defining or
             constraining how this collection is implemented.</summary>
     <remarks>
@@ -67,10 +67,10 @@
       </Parameters>
       <Docs>
         <param name="index">Index into the collection.</param>
-        <summary>Returns the &lt;code&gt;index&lt;/code&gt;th item in the collection.</summary>
-        <returns>The &lt;code&gt;DOMImplementation&lt;/code&gt; at the &lt;code&gt;index&lt;/code&gt;
-              th position in the &lt;code&gt;DOMImplementationList&lt;/code&gt;, or
-              &lt;code&gt;null&lt;/code&gt; if that is not a valid index.</returns>
+        <summary>Returns the <c>index</c>th item in the collection.</summary>
+        <returns>The <c>DOMImplementation</c> at the <c>index</c>
+              th position in the <c>DOMImplementationList</c>, or
+              <c>null</c> if that is not a valid index.</returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Org.W3c.Dom/IDOMImplementationSource.xml b/docs/Mono.Android/en/Org.W3c.Dom/IDOMImplementationSource.xml
index 2cacf7dd98..4e15973fd2 100644
--- a/docs/Mono.Android/en/Org.W3c.Dom/IDOMImplementationSource.xml
+++ b/docs/Mono.Android/en/Org.W3c.Dom/IDOMImplementationSource.xml
@@ -70,18 +70,18 @@
               are required. This is a space separated list in which each feature
               is specified by its name optionally followed by a space and a
               version number.  This method returns the first item of the list
-              returned by &lt;code&gt;getDOMImplementationList&lt;/code&gt;.  As an example,
-              the string &lt;code&gt;"XML 3.0 Traversal +Events 2.0"&lt;/code&gt; will
+              returned by <c>getDOMImplementationList</c>.  As an example,
+              the string <c>"XML 3.0 Traversal +Events 2.0"</c> will
               request a DOM implementation that supports the module "XML" for its
               3.0 version, a module that support of the "Traversal" module for
               any version, and the module "Events" for its 2.0 version. The
               module "Events" must be accessible using the method
-              &lt;code&gt;Node.getFeature()&lt;/code&gt; and
-              &lt;code&gt;DOMImplementation.getFeature()&lt;/code&gt;.</param>
+              <c>Node.getFeature()</c> and
+              <c>DOMImplementation.getFeature()</c>.</param>
         <summary>A method to request the first DOM implementation that supports the
             specified features.</summary>
         <returns>The first DOM implementation that support the desired
-              features, or &lt;code&gt;null&lt;/code&gt; if this source has none.</returns>
+              features, or <c>null</c> if this source has none.</returns>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Org.W3c.Dom/IDOMLocator.xml b/docs/Mono.Android/en/Org.W3c.Dom/IDOMLocator.xml
index 7f14997fa2..9b505e0801 100644
--- a/docs/Mono.Android/en/Org.W3c.Dom/IDOMLocator.xml
+++ b/docs/Mono.Android/en/Org.W3c.Dom/IDOMLocator.xml
@@ -25,7 +25,8 @@
     </Attribute>
   </Attributes>
   <Docs since="8">
-    <summary>&lt;code&gt;DOMLocator&lt;/code&gt; is an interface that describes a location (e.</summary>
+    <summary>
+      <c>DOMLocator</c> is an interface that describes a location (e.</summary>
     <remarks>
       <para>
         <format type="text/html">
diff --git a/docs/Mono.Android/en/Org.W3c.Dom/IDOMStringList.xml b/docs/Mono.Android/en/Org.W3c.Dom/IDOMStringList.xml
index e2cb7f981b..ca64f95188 100644
--- a/docs/Mono.Android/en/Org.W3c.Dom/IDOMStringList.xml
+++ b/docs/Mono.Android/en/Org.W3c.Dom/IDOMStringList.xml
@@ -25,8 +25,8 @@
     </Attribute>
   </Attributes>
   <Docs since="8">
-    <summary>The &lt;code&gt;DOMStringList&lt;/code&gt; interface provides the abstraction of an
-            ordered collection of &lt;code&gt;DOMString&lt;/code&gt; values, without defining or
+    <summary>The <c>DOMStringList</c> interface provides the abstraction of an
+            ordered collection of <c>DOMString</c> values, without defining or
             constraining how this collection is implemented.</summary>
     <remarks>
       <para>
@@ -67,9 +67,10 @@
       </Parameters>
       <Docs>
         <param name="str">The string to look for.</param>
-        <summary>Test if a string is part of this &lt;code&gt;DOMStringList&lt;/code&gt;.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if the string has been found,
-              &lt;code&gt;false&lt;/code&gt; otherwise.</returns>
+        <summary>Test if a string is part of this <c>DOMStringList</c>.</summary>
+        <returns>
+          <c>true</c> if the string has been found,
+              <c>false</c> otherwise.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -109,9 +110,9 @@
       </Parameters>
       <Docs>
         <param name="index">Index into the collection.</param>
-        <summary>Returns the &lt;code&gt;index&lt;/code&gt;th item in the collection.</summary>
-        <returns>The &lt;code&gt;DOMString&lt;/code&gt; at the &lt;code&gt;index&lt;/code&gt;th
-              position in the &lt;code&gt;DOMStringList&lt;/code&gt;, or &lt;code&gt;null&lt;/code&gt; if
+        <summary>Returns the <c>index</c>th item in the collection.</summary>
+        <returns>The <c>DOMString</c> at the <c>index</c>th
+              position in the <c>DOMStringList</c>, or <c>null</c> if
               that is not a valid index.</returns>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Org.W3c.Dom/IDocument.xml b/docs/Mono.Android/en/Org.W3c.Dom/IDocument.xml
index c786288dd6..6862d71f3c 100644
--- a/docs/Mono.Android/en/Org.W3c.Dom/IDocument.xml
+++ b/docs/Mono.Android/en/Org.W3c.Dom/IDocument.xml
@@ -28,7 +28,7 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>The &lt;code&gt;Document&lt;/code&gt; interface represents the entire HTML or XML
+    <summary>The <c>Document</c> interface represents the entire HTML or XML
             document.</summary>
     <remarks>
       <para>
@@ -70,7 +70,7 @@
       <Docs>
         <param name="source">The node to move into this document.</param>
         <summary>Attempts to adopt a node from another document to this document.</summary>
-        <returns>The adopted node, or &lt;code&gt;null&lt;/code&gt; if this operation
+        <returns>The adopted node, or <c>null</c> if this operation
               fails, such as when the source node comes from a different
               implementation.</returns>
         <remarks>
@@ -116,11 +116,11 @@
       </Parameters>
       <Docs>
         <param name="name">The name of the attribute.</param>
-        <summary>Creates an &lt;code&gt;Attr&lt;/code&gt; of the given name.</summary>
-        <returns>A new &lt;code&gt;Attr&lt;/code&gt; object with the &lt;code&gt;nodeName&lt;/code&gt;
-              attribute set to &lt;code&gt;name&lt;/code&gt;, and &lt;code&gt;localName&lt;/code&gt;,
-              &lt;code&gt;prefix&lt;/code&gt;, and &lt;code&gt;namespaceURI&lt;/code&gt; set to
-              &lt;code&gt;null&lt;/code&gt;. The value of the attribute is the empty string.</returns>
+        <summary>Creates an <c>Attr</c> of the given name.</summary>
+        <returns>A new <c>Attr</c> object with the <c>nodeName</c>
+              attribute set to <c>name</c>, and <c>localName</c>,
+              <c>prefix</c>, and <c>namespaceURI</c> set to
+              <c>null</c>. The value of the attribute is the empty string.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -168,7 +168,7 @@
         <param name="qualifiedName">The qualified name of the attribute to
               instantiate.</param>
         <summary>Creates an attribute of the given qualified name and namespace URI.</summary>
-        <returns>A new &lt;code&gt;Attr&lt;/code&gt; object with the following attributes:
+        <returns>A new <c>Attr</c> object with the following attributes:
             &lt;table border='1' cellpadding='3'&gt;
             &lt;tr&gt;
             &lt;th&gt;
@@ -176,33 +176,33 @@
             &lt;th&gt;Value&lt;/th&gt;
             &lt;/tr&gt;
             &lt;tr&gt;
-            &lt;td valign='top' rowspan='1' colspan='1'&gt;&lt;code&gt;Node.nodeName&lt;/code&gt;&lt;/td&gt;
+            &lt;td valign='top' rowspan='1' colspan='1'&gt;<c>Node.nodeName</c>&lt;/td&gt;
             &lt;td valign='top' rowspan='1' colspan='1'&gt;qualifiedName&lt;/td&gt;
             &lt;/tr&gt;
             &lt;tr&gt;
             &lt;td valign='top' rowspan='1' colspan='1'&gt;
-              &lt;code&gt;Node.namespaceURI&lt;/code&gt;&lt;/td&gt;
-            &lt;td valign='top' rowspan='1' colspan='1'&gt;&lt;code&gt;namespaceURI&lt;/code&gt;&lt;/td&gt;
+              <c>Node.namespaceURI</c>&lt;/td&gt;
+            &lt;td valign='top' rowspan='1' colspan='1'&gt;<c>namespaceURI</c>&lt;/td&gt;
             &lt;/tr&gt;
             &lt;tr&gt;
             &lt;td valign='top' rowspan='1' colspan='1'&gt;
-              &lt;code&gt;Node.prefix&lt;/code&gt;&lt;/td&gt;
+              <c>Node.prefix</c>&lt;/td&gt;
             &lt;td valign='top' rowspan='1' colspan='1'&gt;prefix, extracted from
-              &lt;code&gt;qualifiedName&lt;/code&gt;, or &lt;code&gt;null&lt;/code&gt; if there is no
+              <c>qualifiedName</c>, or <c>null</c> if there is no
               prefix&lt;/td&gt;
             &lt;/tr&gt;
             &lt;tr&gt;
-            &lt;td valign='top' rowspan='1' colspan='1'&gt;&lt;code&gt;Node.localName&lt;/code&gt;&lt;/td&gt;
+            &lt;td valign='top' rowspan='1' colspan='1'&gt;<c>Node.localName</c>&lt;/td&gt;
             &lt;td valign='top' rowspan='1' colspan='1'&gt;local name, extracted from
-              &lt;code&gt;qualifiedName&lt;/code&gt;&lt;/td&gt;
+              <c>qualifiedName</c>&lt;/td&gt;
             &lt;/tr&gt;
             &lt;tr&gt;
-            &lt;td valign='top' rowspan='1' colspan='1'&gt;&lt;code&gt;Attr.name&lt;/code&gt;&lt;/td&gt;
+            &lt;td valign='top' rowspan='1' colspan='1'&gt;<c>Attr.name</c>&lt;/td&gt;
             &lt;td valign='top' rowspan='1' colspan='1'&gt;
-              &lt;code&gt;qualifiedName&lt;/code&gt;&lt;/td&gt;
+              <c>qualifiedName</c>&lt;/td&gt;
             &lt;/tr&gt;
             &lt;tr&gt;
-            &lt;td valign='top' rowspan='1' colspan='1'&gt;&lt;code&gt;Node.nodeValue&lt;/code&gt;&lt;/td&gt;
+            &lt;td valign='top' rowspan='1' colspan='1'&gt;<c>Node.nodeValue</c>&lt;/td&gt;
             &lt;td valign='top' rowspan='1' colspan='1'&gt;the empty
               string&lt;/td&gt;
             &lt;/tr&gt;
@@ -258,10 +258,10 @@
         <Parameter Name="data" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="data">The data for the &lt;code&gt;CDATASection&lt;/code&gt; contents.</param>
-        <summary>Creates a &lt;code&gt;CDATASection&lt;/code&gt; node whose value is the specified
+        <param name="data">The data for the <c>CDATASection</c> contents.</param>
+        <summary>Creates a <c>CDATASection</c> node whose value is the specified
             string.</summary>
-        <returns>The new &lt;code&gt;CDATASection&lt;/code&gt; object.</returns>
+        <returns>The new <c>CDATASection</c> object.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -303,8 +303,8 @@
       </Parameters>
       <Docs>
         <param name="data">The data for the node.</param>
-        <summary>Creates a &lt;code&gt;Comment&lt;/code&gt; node given the specified string.</summary>
-        <returns>The new &lt;code&gt;Comment&lt;/code&gt; object.</returns>
+        <summary>Creates a <c>Comment</c> node given the specified string.</summary>
+        <returns>The new <c>Comment</c> object.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -341,8 +341,8 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Creates an empty &lt;code&gt;DocumentFragment&lt;/code&gt; object.</summary>
-        <returns>A new &lt;code&gt;DocumentFragment&lt;/code&gt;.</returns>
+        <summary>Creates an empty <c>DocumentFragment</c> object.</summary>
+        <returns>A new <c>DocumentFragment</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -387,10 +387,10 @@
               name is mapped to the canonical form of that markup by the DOM
               implementation.</param>
         <summary>Creates an element of the type specified.</summary>
-        <returns>A new &lt;code&gt;Element&lt;/code&gt; object with the
-              &lt;code&gt;nodeName&lt;/code&gt; attribute set to &lt;code&gt;tagName&lt;/code&gt;, and
-              &lt;code&gt;localName&lt;/code&gt;, &lt;code&gt;prefix&lt;/code&gt;, and
-              &lt;code&gt;namespaceURI&lt;/code&gt; set to &lt;code&gt;null&lt;/code&gt;.</returns>
+        <returns>A new <c>Element</c> object with the
+              <c>nodeName</c> attribute set to <c>tagName</c>, and
+              <c>localName</c>, <c>prefix</c>, and
+              <c>namespaceURI</c> set to <c>null</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -438,7 +438,7 @@
         <param name="qualifiedName">The qualified name of the element type to
               instantiate.</param>
         <summary>Creates an element of the given qualified name and namespace URI.</summary>
-        <returns>A new &lt;code&gt;Element&lt;/code&gt; object with the following
+        <returns>A new <c>Element</c> object with the following
               attributes:
             &lt;table border='1' cellpadding='3'&gt;
             &lt;tr&gt;
@@ -446,30 +446,30 @@
             &lt;th&gt;Value&lt;/th&gt;
             &lt;/tr&gt;
             &lt;tr&gt;
-            &lt;td valign='top' rowspan='1' colspan='1'&gt;&lt;code&gt;Node.nodeName&lt;/code&gt;&lt;/td&gt;
+            &lt;td valign='top' rowspan='1' colspan='1'&gt;<c>Node.nodeName</c>&lt;/td&gt;
             &lt;td valign='top' rowspan='1' colspan='1'&gt;
-              &lt;code&gt;qualifiedName&lt;/code&gt;&lt;/td&gt;
+              <c>qualifiedName</c>&lt;/td&gt;
             &lt;/tr&gt;
             &lt;tr&gt;
-            &lt;td valign='top' rowspan='1' colspan='1'&gt;&lt;code&gt;Node.namespaceURI&lt;/code&gt;&lt;/td&gt;
+            &lt;td valign='top' rowspan='1' colspan='1'&gt;<c>Node.namespaceURI</c>&lt;/td&gt;
             &lt;td valign='top' rowspan='1' colspan='1'&gt;
-              &lt;code&gt;namespaceURI&lt;/code&gt;&lt;/td&gt;
+              <c>namespaceURI</c>&lt;/td&gt;
             &lt;/tr&gt;
             &lt;tr&gt;
-            &lt;td valign='top' rowspan='1' colspan='1'&gt;&lt;code&gt;Node.prefix&lt;/code&gt;&lt;/td&gt;
+            &lt;td valign='top' rowspan='1' colspan='1'&gt;<c>Node.prefix</c>&lt;/td&gt;
             &lt;td valign='top' rowspan='1' colspan='1'&gt;prefix, extracted
-              from &lt;code&gt;qualifiedName&lt;/code&gt;, or &lt;code&gt;null&lt;/code&gt; if there is
+              from <c>qualifiedName</c>, or <c>null</c> if there is
               no prefix&lt;/td&gt;
             &lt;/tr&gt;
             &lt;tr&gt;
-            &lt;td valign='top' rowspan='1' colspan='1'&gt;&lt;code&gt;Node.localName&lt;/code&gt;&lt;/td&gt;
+            &lt;td valign='top' rowspan='1' colspan='1'&gt;<c>Node.localName</c>&lt;/td&gt;
             &lt;td valign='top' rowspan='1' colspan='1'&gt;local name, extracted from
-              &lt;code&gt;qualifiedName&lt;/code&gt;&lt;/td&gt;
+              <c>qualifiedName</c>&lt;/td&gt;
             &lt;/tr&gt;
             &lt;tr&gt;
-            &lt;td valign='top' rowspan='1' colspan='1'&gt;&lt;code&gt;Element.tagName&lt;/code&gt;&lt;/td&gt;
+            &lt;td valign='top' rowspan='1' colspan='1'&gt;<c>Element.tagName</c>&lt;/td&gt;
             &lt;td valign='top' rowspan='1' colspan='1'&gt;
-              &lt;code&gt;qualifiedName&lt;/code&gt;&lt;/td&gt;
+              <c>qualifiedName</c>&lt;/td&gt;
             &lt;/tr&gt;
             &lt;/table&gt;</returns>
         <remarks>
@@ -525,14 +525,14 @@
       </Parameters>
       <Docs>
         <param name="name">The name of the entity to reference.Unlike
-              &lt;code&gt;Document.createElementNS&lt;/code&gt; or
-              &lt;code&gt;Document.createAttributeNS&lt;/code&gt;, no namespace well-formed
+              <c>Document.createElementNS</c> or
+              <c>Document.createAttributeNS</c>, no namespace well-formed
               checking is done on the entity name. Applications should invoke
-              &lt;code&gt;Document.normalizeDocument()&lt;/code&gt; with the parameter "
-              namespaces" set to &lt;code&gt;true&lt;/code&gt; in order to ensure that the
+              <c>Document.normalizeDocument()</c> with the parameter "
+              namespaces" set to <c>true</c> in order to ensure that the
               entity name is namespace well-formed.</param>
-        <summary>Creates an &lt;code&gt;EntityReference&lt;/code&gt; object.</summary>
-        <returns>The new &lt;code&gt;EntityReference&lt;/code&gt; object.</returns>
+        <summary>Creates an <c>EntityReference</c> object.</summary>
+        <returns>The new <c>EntityReference</c> object.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -578,16 +578,16 @@
       </Parameters>
       <Docs>
         <param name="target">The target part of the processing instruction.Unlike
-              &lt;code&gt;Document.createElementNS&lt;/code&gt; or
-              &lt;code&gt;Document.createAttributeNS&lt;/code&gt;, no namespace well-formed
+              <c>Document.createElementNS</c> or
+              <c>Document.createAttributeNS</c>, no namespace well-formed
               checking is done on the target name. Applications should invoke
-              &lt;code&gt;Document.normalizeDocument()&lt;/code&gt; with the parameter "
-              namespaces" set to &lt;code&gt;true&lt;/code&gt; in order to ensure that the
+              <c>Document.normalizeDocument()</c> with the parameter "
+              namespaces" set to <c>true</c> in order to ensure that the
               target name is namespace well-formed.</param>
         <param name="data">The data for the node.</param>
-        <summary>Creates a &lt;code&gt;ProcessingInstruction&lt;/code&gt; node given the specified
+        <summary>Creates a <c>ProcessingInstruction</c> node given the specified
             name and data strings.</summary>
-        <returns>The new &lt;code&gt;ProcessingInstruction&lt;/code&gt; object.</returns>
+        <returns>The new <c>ProcessingInstruction</c> object.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -632,8 +632,8 @@
       </Parameters>
       <Docs>
         <param name="data">The data for the node.</param>
-        <summary>Creates a &lt;code&gt;Text&lt;/code&gt; node given the specified string.</summary>
-        <returns>The new &lt;code&gt;Text&lt;/code&gt; object.</returns>
+        <summary>Creates a <c>Text</c> node given the specified string.</summary>
+        <returns>The new <c>Text</c> object.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -793,10 +793,10 @@
         <Parameter Name="elementId" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="elementId">The unique &lt;code&gt;id&lt;/code&gt; value for an element.</param>
-        <summary>Returns the &lt;code&gt;Element&lt;/code&gt; that has an ID attribute with the
+        <param name="elementId">The unique <c>id</c> value for an element.</param>
+        <summary>Returns the <c>Element</c> that has an ID attribute with the
             given value.</summary>
-        <returns>The matching element or &lt;code&gt;null&lt;/code&gt; if there is none.</returns>
+        <returns>The matching element or <c>null</c> if there is none.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -836,14 +836,14 @@
       </Parameters>
       <Docs>
         <param name="tagname">The name of the tag to match on. The special value "*"
-              matches all tags. For XML, the &lt;code&gt;tagname&lt;/code&gt; parameter is
+              matches all tags. For XML, the <c>tagname</c> parameter is
               case-sensitive, otherwise it depends on the case-sensitivity of the
               markup language in use.</param>
-        <summary>Returns a &lt;code&gt;NodeList&lt;/code&gt; of all the &lt;code&gt;Elements&lt;/code&gt; in
+        <summary>Returns a <c>NodeList</c> of all the <c>Elements</c> in
             document order with a given tag name and are contained in the
             document.</summary>
-        <returns>A new &lt;code&gt;NodeList&lt;/code&gt; object containing all the matched
-              &lt;code&gt;Elements&lt;/code&gt;.</returns>
+        <returns>A new <c>NodeList</c> object containing all the matched
+              <c>Elements</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -884,13 +884,13 @@
       </Parameters>
       <Docs>
         <param name="namespaceURI">The namespace URI of the elements to match on. The
-              special value &lt;code&gt;"*"&lt;/code&gt; matches all namespaces.</param>
+              special value <c>"*"</c> matches all namespaces.</param>
         <param name="localName">The local name of the elements to match on. The
               special value "*" matches all local names.</param>
-        <summary>Returns a &lt;code&gt;NodeList&lt;/code&gt; of all the &lt;code&gt;Elements&lt;/code&gt; with a
+        <summary>Returns a <c>NodeList</c> of all the <c>Elements</c> with a
             given local name and namespace URI in document order.</summary>
-        <returns>A new &lt;code&gt;NodeList&lt;/code&gt; object containing all the matched
-              &lt;code&gt;Elements&lt;/code&gt;.</returns>
+        <returns>A new <c>NodeList</c> object containing all the matched
+              <c>Elements</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -959,15 +959,15 @@
       </Parameters>
       <Docs>
         <param name="importedNode">The node to import.</param>
-        <param name="deep">If &lt;code&gt;true&lt;/code&gt;, recursively import the subtree under
-              the specified node; if &lt;code&gt;false&lt;/code&gt;, import only the node
+        <param name="deep">If <c>true</c>, recursively import the subtree under
+              the specified node; if <c>false</c>, import only the node
               itself, as explained above. This has no effect on nodes that cannot
-              have any children, and on &lt;code&gt;Attr&lt;/code&gt;, and
-              &lt;code&gt;EntityReference&lt;/code&gt; nodes.</param>
+              have any children, and on <c>Attr</c>, and
+              <c>EntityReference</c> nodes.</param>
         <summary>Imports a node from another document to this document, without altering
             or removing the source node from the original document; this method
             creates a new copy of the source node.</summary>
-        <returns>The imported node that belongs to this &lt;code&gt;Document&lt;/code&gt;.</returns>
+        <returns>The imported node that belongs to this <c>Document</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1085,8 +1085,8 @@
         <param name="n">The node to rename.</param>
         <param name="namespaceURI">The new namespace URI.</param>
         <param name="qualifiedName">The new qualified name.</param>
-        <summary>Rename an existing node of type &lt;code&gt;ELEMENT_NODE&lt;/code&gt; or
-            &lt;code&gt;ATTRIBUTE_NODE&lt;/code&gt;.</summary>
+        <summary>Rename an existing node of type <c>ELEMENT_NODE</c> or
+            <c>ATTRIBUTE_NODE</c>.</summary>
         <returns>The renamed node. This is either the specified node or the new
               node that was created to replace the specified node.</returns>
         <remarks>
diff --git a/docs/Mono.Android/en/Org.W3c.Dom/IDocumentFragment.xml b/docs/Mono.Android/en/Org.W3c.Dom/IDocumentFragment.xml
index 1c02cb715c..66c7c8e3d0 100644
--- a/docs/Mono.Android/en/Org.W3c.Dom/IDocumentFragment.xml
+++ b/docs/Mono.Android/en/Org.W3c.Dom/IDocumentFragment.xml
@@ -28,8 +28,9 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>&lt;code&gt;DocumentFragment&lt;/code&gt; is a "lightweight" or "minimal"
-            &lt;code&gt;Document&lt;/code&gt; object.</summary>
+    <summary>
+      <c>DocumentFragment</c> is a "lightweight" or "minimal"
+            <c>Document</c> object.</summary>
     <remarks>
       <para>
         <format type="text/html">
diff --git a/docs/Mono.Android/en/Org.W3c.Dom/IDocumentType.xml b/docs/Mono.Android/en/Org.W3c.Dom/IDocumentType.xml
index add997965e..1e6e858ae5 100644
--- a/docs/Mono.Android/en/Org.W3c.Dom/IDocumentType.xml
+++ b/docs/Mono.Android/en/Org.W3c.Dom/IDocumentType.xml
@@ -28,8 +28,8 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>Each &lt;code&gt;Document&lt;/code&gt; has a &lt;code&gt;doctype&lt;/code&gt; attribute whose value
-            is either &lt;code&gt;null&lt;/code&gt; or a &lt;code&gt;DocumentType&lt;/code&gt; object.</summary>
+    <summary>Each <c>Document</c> has a <c>doctype</c> attribute whose value
+            is either <c>null</c> or a <c>DocumentType</c> object.</summary>
     <remarks>
       <para>
         <format type="text/html">
diff --git a/docs/Mono.Android/en/Org.W3c.Dom/IElement.xml b/docs/Mono.Android/en/Org.W3c.Dom/IElement.xml
index ac52d42d05..2baeee5d86 100644
--- a/docs/Mono.Android/en/Org.W3c.Dom/IElement.xml
+++ b/docs/Mono.Android/en/Org.W3c.Dom/IElement.xml
@@ -28,7 +28,7 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>The &lt;code&gt;Element&lt;/code&gt; interface represents an element in an HTML or XML
+    <summary>The <c>Element</c> interface represents an element in an HTML or XML
             document.</summary>
     <remarks>
       <para>
@@ -70,7 +70,7 @@
       <Docs>
         <param name="name">The name of the attribute to retrieve.</param>
         <summary>Retrieves an attribute value by name.</summary>
-        <returns>The &lt;code&gt;Attr&lt;/code&gt; value as a string, or the empty string
+        <returns>The <c>Attr</c> value as a string, or the empty string
               if that attribute does not have a specified or default value.</returns>
         <remarks>
           <para>
@@ -110,11 +110,11 @@
         <Parameter Name="name" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="name">The name (&lt;code&gt;nodeName&lt;/code&gt;) of the attribute to
+        <param name="name">The name (<c>nodeName</c>) of the attribute to
               retrieve.</param>
         <summary>Retrieves an attribute node by name.</summary>
-        <returns>The &lt;code&gt;Attr&lt;/code&gt; node with the specified name (
-              &lt;code&gt;nodeName&lt;/code&gt;) or &lt;code&gt;null&lt;/code&gt; if there is no such
+        <returns>The <c>Attr</c> node with the specified name (
+              <c>nodeName</c>) or <c>null</c> if there is no such
               attribute.</returns>
         <remarks>
           <para>
@@ -157,9 +157,9 @@
       <Docs>
         <param name="namespaceURI">The namespace URI of the attribute to retrieve.</param>
         <param name="localName">The local name of the attribute to retrieve.</param>
-        <summary>Retrieves an &lt;code&gt;Attr&lt;/code&gt; node by local name and namespace URI.</summary>
-        <returns>The &lt;code&gt;Attr&lt;/code&gt; node with the specified attribute local
-              name and namespace URI or &lt;code&gt;null&lt;/code&gt; if there is no such
+        <summary>Retrieves an <c>Attr</c> node by local name and namespace URI.</summary>
+        <returns>The <c>Attr</c> node with the specified attribute local
+              name and namespace URI or <c>null</c> if there is no such
               attribute.</returns>
         <remarks>
           <para>
@@ -206,7 +206,7 @@
         <param name="namespaceURI">The namespace URI of the attribute to retrieve.</param>
         <param name="localName">The local name of the attribute to retrieve.</param>
         <summary>Retrieves an attribute value by local name and namespace URI.</summary>
-        <returns>The &lt;code&gt;Attr&lt;/code&gt; value as a string, or the empty string
+        <returns>The <c>Attr</c> value as a string, or the empty string
               if that attribute does not have a specified or default value.</returns>
         <remarks>
           <para>
@@ -251,9 +251,9 @@
       <Docs>
         <param name="name">The name of the tag to match on. The special value "*"
               matches all tags.</param>
-        <summary>Returns a &lt;code&gt;NodeList&lt;/code&gt; of all descendant &lt;code&gt;Elements&lt;/code&gt;
+        <summary>Returns a <c>NodeList</c> of all descendant <c>Elements</c>
             with a given tag name, in document order.</summary>
-        <returns>A list of matching &lt;code&gt;Element&lt;/code&gt; nodes.</returns>
+        <returns>A list of matching <c>Element</c> nodes.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -297,11 +297,11 @@
               special value "*" matches all namespaces.</param>
         <param name="localName">The local name of the elements to match on. The
               special value "*" matches all local names.</param>
-        <summary>Returns a &lt;code&gt;NodeList&lt;/code&gt; of all the descendant
-            &lt;code&gt;Elements&lt;/code&gt; with a given local name and namespace URI in
+        <summary>Returns a <c>NodeList</c> of all the descendant
+            <c>Elements</c> with a given local name and namespace URI in
             document order.</summary>
-        <returns>A new &lt;code&gt;NodeList&lt;/code&gt; object containing all the matched
-              &lt;code&gt;Elements&lt;/code&gt;.</returns>
+        <returns>A new <c>NodeList</c> object containing all the matched
+              <c>Elements</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -344,11 +344,12 @@
       </Parameters>
       <Docs>
         <param name="name">The name of the attribute to look for.</param>
-        <summary>Returns &lt;code&gt;true&lt;/code&gt; when an attribute with a given name is
-            specified on this element or has a default value, &lt;code&gt;false&lt;/code&gt;
+        <summary>Returns <c>true</c> when an attribute with a given name is
+            specified on this element or has a default value, <c>false</c>
             otherwise.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if an attribute with the given name is
-              specified on this element or has a default value, &lt;code&gt;false&lt;/code&gt;
+        <returns>
+          <c>true</c> if an attribute with the given name is
+              specified on this element or has a default value, <c>false</c>
                otherwise.</returns>
         <remarks>
           <para>
@@ -391,12 +392,13 @@
       <Docs>
         <param name="namespaceURI">The namespace URI of the attribute to look for.</param>
         <param name="localName">The local name of the attribute to look for.</param>
-        <summary>Returns &lt;code&gt;true&lt;/code&gt; when an attribute with a given local name and
+        <summary>Returns <c>true</c> when an attribute with a given local name and
             namespace URI is specified on this element or has a default value,
-            &lt;code&gt;false&lt;/code&gt; otherwise.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if an attribute with the given local name
+            <c>false</c> otherwise.</summary>
+        <returns>
+          <c>true</c> if an attribute with the given local name
               and namespace URI is specified or has a default value on this
-              element, &lt;code&gt;false&lt;/code&gt; otherwise.</returns>
+              element, <c>false</c> otherwise.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -480,10 +482,10 @@
         <Parameter Name="oldAttr" Type="Org.W3c.Dom.IAttr" />
       </Parameters>
       <Docs>
-        <param name="oldAttr">The &lt;code&gt;Attr&lt;/code&gt; node to remove from the attribute
+        <param name="oldAttr">The <c>Attr</c> node to remove from the attribute
               list.</param>
         <summary>Removes the specified attribute node.</summary>
-        <returns>The &lt;code&gt;Attr&lt;/code&gt; node that was removed.</returns>
+        <returns>The <c>Attr</c> node that was removed.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -647,11 +649,11 @@
         <Parameter Name="newAttr" Type="Org.W3c.Dom.IAttr" />
       </Parameters>
       <Docs>
-        <param name="newAttr">The &lt;code&gt;Attr&lt;/code&gt; node to add to the attribute list.</param>
+        <param name="newAttr">The <c>Attr</c> node to add to the attribute list.</param>
         <summary>Adds a new attribute node.</summary>
-        <returns>If the &lt;code&gt;newAttr&lt;/code&gt; attribute replaces an existing
-              attribute, the replaced &lt;code&gt;Attr&lt;/code&gt; node is returned,
-              otherwise &lt;code&gt;null&lt;/code&gt; is returned.</returns>
+        <returns>If the <c>newAttr</c> attribute replaces an existing
+              attribute, the replaced <c>Attr</c> node is returned,
+              otherwise <c>null</c> is returned.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -698,11 +700,11 @@
         <Parameter Name="newAttr" Type="Org.W3c.Dom.IAttr" />
       </Parameters>
       <Docs>
-        <param name="newAttr">The &lt;code&gt;Attr&lt;/code&gt; node to add to the attribute list.</param>
+        <param name="newAttr">The <c>Attr</c> node to add to the attribute list.</param>
         <summary>Adds a new attribute.</summary>
-        <returns>If the &lt;code&gt;newAttr&lt;/code&gt; attribute replaces an existing
+        <returns>If the <c>newAttr</c> attribute replaces an existing
               attribute with the same local name and namespace URI, the replaced
-              &lt;code&gt;Attr&lt;/code&gt; node is returned, otherwise &lt;code&gt;null&lt;/code&gt; is
+              <c>Attr</c> node is returned, otherwise <c>null</c> is
               returned.</returns>
         <remarks>
           <para>
@@ -815,7 +817,7 @@
       <Docs>
         <param name="name">The name of the attribute.</param>
         <param name="isId">Whether the attribute is a of type ID.</param>
-        <summary>If the parameter &lt;code&gt;isId&lt;/code&gt; is &lt;code&gt;true&lt;/code&gt;, this method
+        <summary>If the parameter <c>isId</c> is <c>true</c>, this method
             declares the specified attribute to be a user-determined ID attribute
             .</summary>
         <remarks>
@@ -862,7 +864,7 @@
       <Docs>
         <param name="idAttr">The attribute node.</param>
         <param name="isId">Whether the attribute is a of type ID.</param>
-        <summary>If the parameter &lt;code&gt;isId&lt;/code&gt; is &lt;code&gt;true&lt;/code&gt;, this method
+        <summary>If the parameter <c>isId</c> is <c>true</c>, this method
             declares the specified attribute to be a user-determined ID attribute
             .</summary>
         <remarks>
@@ -911,7 +913,7 @@
         <param name="namespaceURI">The namespace URI of the attribute.</param>
         <param name="localName">The local name of the attribute.</param>
         <param name="isId">Whether the attribute is a of type ID.</param>
-        <summary>If the parameter &lt;code&gt;isId&lt;/code&gt; is &lt;code&gt;true&lt;/code&gt;, this method
+        <summary>If the parameter <c>isId</c> is <c>true</c>, this method
             declares the specified attribute to be a user-determined ID attribute
             .</summary>
         <remarks>
diff --git a/docs/Mono.Android/en/Org.W3c.Dom/IEntityReference.xml b/docs/Mono.Android/en/Org.W3c.Dom/IEntityReference.xml
index 698d6d699f..9f46730df6 100644
--- a/docs/Mono.Android/en/Org.W3c.Dom/IEntityReference.xml
+++ b/docs/Mono.Android/en/Org.W3c.Dom/IEntityReference.xml
@@ -28,7 +28,8 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>&lt;code&gt;EntityReference&lt;/code&gt; nodes may be used to represent an entity
+    <summary>
+      <c>EntityReference</c> nodes may be used to represent an entity
             reference in the tree.</summary>
     <remarks>
       <para>
diff --git a/docs/Mono.Android/en/Org.W3c.Dom/INameList.xml b/docs/Mono.Android/en/Org.W3c.Dom/INameList.xml
index 48a21dc881..76ec965521 100644
--- a/docs/Mono.Android/en/Org.W3c.Dom/INameList.xml
+++ b/docs/Mono.Android/en/Org.W3c.Dom/INameList.xml
@@ -25,7 +25,7 @@
     </Attribute>
   </Attributes>
   <Docs since="8">
-    <summary>The &lt;code&gt;NameList&lt;/code&gt; interface provides the abstraction of an ordered
+    <summary>The <c>NameList</c> interface provides the abstraction of an ordered
             collection of parallel pairs of name and namespace values (which could be
             null values), without defining or constraining how this collection is
             implemented.</summary>
@@ -68,9 +68,10 @@
       </Parameters>
       <Docs>
         <param name="str">The name to look for.</param>
-        <summary>Test if a name is part of this &lt;code&gt;NameList&lt;/code&gt;.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if the name has been found,
-              &lt;code&gt;false&lt;/code&gt; otherwise.</returns>
+        <summary>Test if a name is part of this <c>NameList</c>.</summary>
+        <returns>
+          <c>true</c> if the name has been found,
+              <c>false</c> otherwise.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -113,9 +114,10 @@
         <param name="namespaceURI">The namespace URI to look for.</param>
         <param name="name">The name to look for.</param>
         <summary>Test if the pair namespaceURI/name is part of this
-            &lt;code&gt;NameList&lt;/code&gt;.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if the pair namespaceURI/name has been
-              found, &lt;code&gt;false&lt;/code&gt; otherwise.</returns>
+            <c>NameList</c>.</summary>
+        <returns>
+          <c>true</c> if the pair namespaceURI/name has been
+              found, <c>false</c> otherwise.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -155,9 +157,9 @@
       </Parameters>
       <Docs>
         <param name="index">Index into the collection.</param>
-        <summary>Returns the &lt;code&gt;index&lt;/code&gt;th name item in the collection.</summary>
-        <returns>The name at the &lt;code&gt;index&lt;/code&gt;th position in the
-              &lt;code&gt;NameList&lt;/code&gt;, or &lt;code&gt;null&lt;/code&gt; if there is no name for
+        <summary>Returns the <c>index</c>th name item in the collection.</summary>
+        <returns>The name at the <c>index</c>th position in the
+              <c>NameList</c>, or <c>null</c> if there is no name for
               the specified index or if the index is out of range.</returns>
         <remarks>
           <para>
@@ -198,9 +200,9 @@
       </Parameters>
       <Docs>
         <param name="index">Index into the collection.</param>
-        <summary>Returns the &lt;code&gt;index&lt;/code&gt;th namespaceURI item in the collection.</summary>
-        <returns>The namespace URI at the &lt;code&gt;index&lt;/code&gt;th position in the
-              &lt;code&gt;NameList&lt;/code&gt;, or &lt;code&gt;null&lt;/code&gt; if there is no name for
+        <summary>Returns the <c>index</c>th namespaceURI item in the collection.</summary>
+        <returns>The namespace URI at the <c>index</c>th position in the
+              <c>NameList</c>, or <c>null</c> if there is no name for
               the specified index or if the index is out of range.</returns>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Org.W3c.Dom/INamedNodeMap.xml b/docs/Mono.Android/en/Org.W3c.Dom/INamedNodeMap.xml
index 8a14d93237..6934d54aab 100644
--- a/docs/Mono.Android/en/Org.W3c.Dom/INamedNodeMap.xml
+++ b/docs/Mono.Android/en/Org.W3c.Dom/INamedNodeMap.xml
@@ -25,7 +25,7 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>Objects implementing the &lt;code&gt;NamedNodeMap&lt;/code&gt; interface are used to
+    <summary>Objects implementing the <c>NamedNodeMap</c> interface are used to
             represent collections of nodes that can be accessed by name.</summary>
     <remarks>
       <para>
@@ -65,10 +65,10 @@
         <Parameter Name="name" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="name">The &lt;code&gt;nodeName&lt;/code&gt; of a node to retrieve.</param>
+        <param name="name">The <c>nodeName</c> of a node to retrieve.</param>
         <summary>Retrieves a node specified by name.</summary>
-        <returns>A &lt;code&gt;Node&lt;/code&gt; (of any type) with the specified
-              &lt;code&gt;nodeName&lt;/code&gt;, or &lt;code&gt;null&lt;/code&gt; if it does not identify
+        <returns>A <c>Node</c> (of any type) with the specified
+              <c>nodeName</c>, or <c>null</c> if it does not identify
               any node in this map.</returns>
         <remarks>
           <para>
@@ -112,8 +112,8 @@
         <param name="namespaceURI">The namespace URI of the node to retrieve.</param>
         <param name="localName">The local name of the node to retrieve.</param>
         <summary>Retrieves a node specified by local name and namespace URI.</summary>
-        <returns>A &lt;code&gt;Node&lt;/code&gt; (of any type) with the specified local
-              name and namespace URI, or &lt;code&gt;null&lt;/code&gt; if they do not
+        <returns>A <c>Node</c> (of any type) with the specified local
+              name and namespace URI, or <c>null</c> if they do not
               identify any node in this map.</returns>
         <remarks>
           <para>
@@ -157,9 +157,9 @@
       </Parameters>
       <Docs>
         <param name="index">Index into this map.</param>
-        <summary>Returns the &lt;code&gt;index&lt;/code&gt;th item in the map.</summary>
-        <returns>The node at the &lt;code&gt;index&lt;/code&gt;th position in the map, or
-              &lt;code&gt;null&lt;/code&gt; if that is not a valid index.</returns>
+        <summary>Returns the <c>index</c>th item in the map.</summary>
+        <returns>The node at the <c>index</c>th position in the map, or
+              <c>null</c> if that is not a valid index.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -226,7 +226,7 @@
         <Parameter Name="name" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="name">The &lt;code&gt;nodeName&lt;/code&gt; of the node to remove.</param>
+        <param name="name">The <c>nodeName</c> of the node to remove.</param>
         <summary>Removes a node specified by name.</summary>
         <returns>The node removed from this map if a node with such a name
               exists.</returns>
@@ -323,10 +323,10 @@
       </Parameters>
       <Docs>
         <param name="arg">A node to store in this map. The node will later be
-              accessible using the value of its &lt;code&gt;nodeName&lt;/code&gt; attribute.</param>
-        <summary>Adds a node using its &lt;code&gt;nodeName&lt;/code&gt; attribute.</summary>
-        <returns>If the new &lt;code&gt;Node&lt;/code&gt; replaces an existing node the
-              replaced &lt;code&gt;Node&lt;/code&gt; is returned, otherwise &lt;code&gt;null&lt;/code&gt;
+              accessible using the value of its <c>nodeName</c> attribute.</param>
+        <summary>Adds a node using its <c>nodeName</c> attribute.</summary>
+        <returns>If the new <c>Node</c> replaces an existing node the
+              replaced <c>Node</c> is returned, otherwise <c>null</c>
               is returned.</returns>
         <remarks>
           <para>
@@ -380,12 +380,12 @@
       </Parameters>
       <Docs>
         <param name="arg">A node to store in this map. The node will later be
-              accessible using the value of its &lt;code&gt;namespaceURI&lt;/code&gt; and
-              &lt;code&gt;localName&lt;/code&gt; attributes.</param>
-        <summary>Adds a node using its &lt;code&gt;namespaceURI&lt;/code&gt; and
-            &lt;code&gt;localName&lt;/code&gt;.</summary>
-        <returns>If the new &lt;code&gt;Node&lt;/code&gt; replaces an existing node the
-              replaced &lt;code&gt;Node&lt;/code&gt; is returned, otherwise &lt;code&gt;null&lt;/code&gt;
+              accessible using the value of its <c>namespaceURI</c> and
+              <c>localName</c> attributes.</param>
+        <summary>Adds a node using its <c>namespaceURI</c> and
+            <c>localName</c>.</summary>
+        <returns>If the new <c>Node</c> replaces an existing node the
+              replaced <c>Node</c> is returned, otherwise <c>null</c>
               is returned.</returns>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Org.W3c.Dom/INode.xml b/docs/Mono.Android/en/Org.W3c.Dom/INode.xml
index 3f67361c3d..959cb17237 100644
--- a/docs/Mono.Android/en/Org.W3c.Dom/INode.xml
+++ b/docs/Mono.Android/en/Org.W3c.Dom/INode.xml
@@ -25,7 +25,7 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>The &lt;code&gt;Node&lt;/code&gt; interface is the primary datatype for the entire
+    <summary>The <c>Node</c> interface is the primary datatype for the entire
             Document Object Model.</summary>
     <remarks>
       <para>
@@ -66,9 +66,9 @@
       </Parameters>
       <Docs>
         <param name="newChild">The node to add.If it is a
-              &lt;code&gt;DocumentFragment&lt;/code&gt; object, the entire contents of the
+              <c>DocumentFragment</c> object, the entire contents of the
               document fragment are moved into the child list of this node</param>
-        <summary>Adds the node &lt;code&gt;newChild&lt;/code&gt; to the end of the list of children
+        <summary>Adds the node <c>newChild</c> to the end of the list of children
             of this node.</summary>
         <returns>The node added.</returns>
         <remarks>
@@ -121,7 +121,7 @@
       </ReturnValue>
       <MemberValue>2</MemberValue>
       <Docs>
-        <summary>The node is an &lt;code&gt;Attr&lt;/code&gt;.</summary>
+        <summary>The node is an <c>Attr</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -215,7 +215,7 @@
       </ReturnValue>
       <MemberValue>4</MemberValue>
       <Docs>
-        <summary>The node is a &lt;code&gt;CDATASection&lt;/code&gt;.</summary>
+        <summary>The node is a <c>CDATASection</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -281,9 +281,9 @@
         <Parameter Name="deep" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="deep">If &lt;code&gt;true&lt;/code&gt;, recursively clone the subtree under
-              the specified node; if &lt;code&gt;false&lt;/code&gt;, clone only the node
-              itself (and its attributes, if it is an &lt;code&gt;Element&lt;/code&gt;).</param>
+        <param name="deep">If <c>true</c>, recursively clone the subtree under
+              the specified node; if <c>false</c>, clone only the node
+              itself (and its attributes, if it is an <c>Element</c>).</param>
         <summary>Returns a duplicate of this node, i.</summary>
         <returns>The duplicate node.</returns>
         <remarks>
@@ -322,7 +322,7 @@
       </ReturnValue>
       <MemberValue>8</MemberValue>
       <Docs>
-        <summary>The node is a &lt;code&gt;Comment&lt;/code&gt;.</summary>
+        <summary>The node is a <c>Comment</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -403,7 +403,7 @@
       </ReturnValue>
       <MemberValue>11</MemberValue>
       <Docs>
-        <summary>The node is a &lt;code&gt;DocumentFragment&lt;/code&gt;.</summary>
+        <summary>The node is a <c>DocumentFragment</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -439,7 +439,7 @@
       </ReturnValue>
       <MemberValue>9</MemberValue>
       <Docs>
-        <summary>The node is a &lt;code&gt;Document&lt;/code&gt;.</summary>
+        <summary>The node is a <c>Document</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -692,7 +692,7 @@
       </ReturnValue>
       <MemberValue>10</MemberValue>
       <Docs>
-        <summary>The node is a &lt;code&gt;DocumentType&lt;/code&gt;.</summary>
+        <summary>The node is a <c>DocumentType</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -728,7 +728,7 @@
       </ReturnValue>
       <MemberValue>1</MemberValue>
       <Docs>
-        <summary>The node is an &lt;code&gt;Element&lt;/code&gt;.</summary>
+        <summary>The node is an <c>Element</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -764,7 +764,7 @@
       </ReturnValue>
       <MemberValue>6</MemberValue>
       <Docs>
-        <summary>The node is an &lt;code&gt;Entity&lt;/code&gt;.</summary>
+        <summary>The node is an <c>Entity</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -800,7 +800,7 @@
       </ReturnValue>
       <MemberValue>5</MemberValue>
       <Docs>
-        <summary>The node is an &lt;code&gt;EntityReference&lt;/code&gt;.</summary>
+        <summary>The node is an <c>EntityReference</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -875,12 +875,12 @@
             specialized APIs of the specified feature and version, as specified
             in .</summary>
         <returns>Returns an object which implements the specialized APIs of
-              the specified feature and version, if any, or &lt;code&gt;null&lt;/code&gt; if
+              the specified feature and version, if any, or <c>null</c> if
               there is no object which implements interfaces associated with that
-              feature. If the &lt;code&gt;DOMObject&lt;/code&gt; returned by this method
-              implements the &lt;code&gt;Node&lt;/code&gt; interface, it must delegate to the
-              primary core &lt;code&gt;Node&lt;/code&gt; and not return results inconsistent
-              with the primary core &lt;code&gt;Node&lt;/code&gt; such as attributes,
+              feature. If the <c>DOMObject</c> returned by this method
+              implements the <c>Node</c> interface, it must delegate to the
+              primary core <c>Node</c> and not return results inconsistent
+              with the primary core <c>Node</c> such as attributes,
               childNodes, etc.</returns>
         <remarks>
           <para>
@@ -922,8 +922,8 @@
       <Docs>
         <param name="key">The key the object is associated to.</param>
         <summary>Retrieves the object associated to a key on a this node.</summary>
-        <returns>Returns the &lt;code&gt;DOMUserData&lt;/code&gt; associated to the given
-              key on this node, or &lt;code&gt;null&lt;/code&gt; if there was none.</returns>
+        <returns>Returns the <c>DOMUserData</c> associated to the given
+              key on this node, or <c>null</c> if there was none.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1022,8 +1022,8 @@
         <param name="newChild">The node to insert.</param>
         <param name="refChild">The reference node, i.e., the node before which the
               new node must be inserted.</param>
-        <summary>Inserts the node &lt;code&gt;newChild&lt;/code&gt; before the existing child node
-            &lt;code&gt;refChild&lt;/code&gt;.</summary>
+        <summary>Inserts the node <c>newChild</c> before the existing child node
+            <c>refChild</c>.</summary>
         <returns>The node being inserted.</returns>
         <remarks>
           <para>
@@ -1080,11 +1080,11 @@
       </Parameters>
       <Docs>
         <param name="namespaceURI">The namespace URI to look for.</param>
-        <summary>This method checks if the specified &lt;code&gt;namespaceURI&lt;/code&gt; is the
+        <summary>This method checks if the specified <c>namespaceURI</c> is the
             default namespace or not.</summary>
-        <returns>Returns &lt;code&gt;true&lt;/code&gt; if the specified
-              &lt;code&gt;namespaceURI&lt;/code&gt; is the default namespace,
-              &lt;code&gt;false&lt;/code&gt; otherwise.</returns>
+        <returns>Returns <c>true</c> if the specified
+              <c>namespaceURI</c> is the default namespace,
+              <c>false</c> otherwise.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1125,8 +1125,8 @@
       <Docs>
         <param name="arg">The node to compare equality with.</param>
         <summary>Tests whether two nodes are equal.</summary>
-        <returns>Returns &lt;code&gt;true&lt;/code&gt; if the nodes are equal,
-              &lt;code&gt;false&lt;/code&gt; otherwise.</returns>
+        <returns>Returns <c>true</c> if the nodes are equal,
+              <c>false</c> otherwise.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1167,8 +1167,8 @@
       <Docs>
         <param name="other">The node to test against.</param>
         <summary>Returns whether this node is the same node as the given one.</summary>
-        <returns>Returns &lt;code&gt;true&lt;/code&gt; if the nodes are the same,
-              &lt;code&gt;false&lt;/code&gt; otherwise.</returns>
+        <returns>Returns <c>true</c> if the nodes are the same,
+              <c>false</c> otherwise.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1212,8 +1212,8 @@
         <param name="version">This is the version number of the feature to test.</param>
         <summary>Tests whether the DOM implementation implements a specific feature and
             that feature is supported by this node, as specified in .</summary>
-        <returns>Returns &lt;code&gt;true&lt;/code&gt; if the specified feature is
-              supported on this node, &lt;code&gt;false&lt;/code&gt; otherwise.</returns>
+        <returns>Returns <c>true</c> if the specified feature is
+              supported on this node, <c>false</c> otherwise.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -1309,11 +1309,11 @@
       </Parameters>
       <Docs>
         <param name="prefix">The prefix to look for. If this parameter is
-              &lt;code&gt;null&lt;/code&gt;, the method will return the default namespace URI
+              <c>null</c>, the method will return the default namespace URI
               if any.</param>
         <summary>Look up the namespace URI associated to the given prefix, starting from
             this node.</summary>
-        <returns>Returns the associated namespace URI or &lt;code&gt;null&lt;/code&gt; if
+        <returns>Returns the associated namespace URI or <c>null</c> if
               none is found.</returns>
         <remarks>
           <para>
@@ -1357,7 +1357,7 @@
         <summary>Look up the prefix associated to the given namespace URI, starting from
             this node.</summary>
         <returns>Returns an associated namespace prefix if found or
-              &lt;code&gt;null&lt;/code&gt; if none is found. If more than one prefix are
+              <c>null</c> if none is found. If more than one prefix are
               associated to the namespace prefix, the returned namespace prefix
               is implementation dependent.</returns>
         <remarks>
@@ -1548,8 +1548,8 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Puts all &lt;code&gt;Text&lt;/code&gt; nodes in the full depth of the sub-tree
-            underneath this &lt;code&gt;Node&lt;/code&gt;, including attribute nodes, into a
+        <summary>Puts all <c>Text</c> nodes in the full depth of the sub-tree
+            underneath this <c>Node</c>, including attribute nodes, into a
             "normal" form where only structure (e.</summary>
         <remarks>
           <para>
@@ -1587,7 +1587,7 @@
       </ReturnValue>
       <MemberValue>12</MemberValue>
       <Docs>
-        <summary>The node is a &lt;code&gt;Notation&lt;/code&gt;.</summary>
+        <summary>The node is a <c>Notation</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -1812,7 +1812,7 @@
       </ReturnValue>
       <MemberValue>7</MemberValue>
       <Docs>
-        <summary>The node is a &lt;code&gt;ProcessingInstruction&lt;/code&gt;.</summary>
+        <summary>The node is a <c>ProcessingInstruction</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -1851,7 +1851,7 @@
       </Parameters>
       <Docs>
         <param name="oldChild">The node being removed.</param>
-        <summary>Removes the child node indicated by &lt;code&gt;oldChild&lt;/code&gt; from the list
+        <summary>Removes the child node indicated by <c>oldChild</c> from the list
             of children, and returns it.</summary>
         <returns>The node removed.</returns>
         <remarks>
@@ -1902,8 +1902,8 @@
       <Docs>
         <param name="newChild">The new node to put in the child list.</param>
         <param name="oldChild">The node being replaced in the list.</param>
-        <summary>Replaces the child node &lt;code&gt;oldChild&lt;/code&gt; with &lt;code&gt;newChild&lt;/code&gt;
-             in the list of children, and returns the &lt;code&gt;oldChild&lt;/code&gt; node.</summary>
+        <summary>Replaces the child node <c>oldChild</c> with <c>newChild</c>
+             in the list of children, and returns the <c>oldChild</c> node.</summary>
         <returns>The node replaced.</returns>
         <remarks>
           <para>
@@ -1964,12 +1964,12 @@
       <Docs>
         <param name="key">The key to associate the object to.</param>
         <param name="data">The object to associate to the given key, or
-              &lt;code&gt;null&lt;/code&gt; to remove any existing association to that key.</param>
+              <c>null</c> to remove any existing association to that key.</param>
         <param name="handler">The handler to associate to that key, or
-              &lt;code&gt;null&lt;/code&gt;.</param>
+              <c>null</c>.</param>
         <summary>Associate an object to a key on this node.</summary>
-        <returns>Returns the &lt;code&gt;DOMUserData&lt;/code&gt; previously associated to
-              the given key on this node, or &lt;code&gt;null&lt;/code&gt; if there was none.</returns>
+        <returns>Returns the <c>DOMUserData</c> previously associated to
+              the given key on this node, or <c>null</c> if there was none.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -2043,7 +2043,7 @@
       </ReturnValue>
       <MemberValue>3</MemberValue>
       <Docs>
-        <summary>The node is a &lt;code&gt;Text&lt;/code&gt; node.</summary>
+        <summary>The node is a <c>Text</c> node.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Org.W3c.Dom/INodeList.xml b/docs/Mono.Android/en/Org.W3c.Dom/INodeList.xml
index 1916e42e10..1b095b95c1 100644
--- a/docs/Mono.Android/en/Org.W3c.Dom/INodeList.xml
+++ b/docs/Mono.Android/en/Org.W3c.Dom/INodeList.xml
@@ -25,7 +25,7 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>The &lt;code&gt;NodeList&lt;/code&gt; interface provides the abstraction of an ordered
+    <summary>The <c>NodeList</c> interface provides the abstraction of an ordered
             collection of nodes, without defining or constraining how this collection
             is implemented.</summary>
     <remarks>
@@ -67,9 +67,9 @@
       </Parameters>
       <Docs>
         <param name="index">Index into the collection.</param>
-        <summary>Returns the &lt;code&gt;index&lt;/code&gt;th item in the collection.</summary>
-        <returns>The node at the &lt;code&gt;index&lt;/code&gt;th position in the
-              &lt;code&gt;NodeList&lt;/code&gt;, or &lt;code&gt;null&lt;/code&gt; if that is not a valid
+        <summary>Returns the <c>index</c>th item in the collection.</summary>
+        <returns>The node at the <c>index</c>th position in the
+              <c>NodeList</c>, or <c>null</c> if that is not a valid
               index.</returns>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Org.W3c.Dom/IProcessingInstruction.xml b/docs/Mono.Android/en/Org.W3c.Dom/IProcessingInstruction.xml
index 8533a650de..f2b5b585cc 100644
--- a/docs/Mono.Android/en/Org.W3c.Dom/IProcessingInstruction.xml
+++ b/docs/Mono.Android/en/Org.W3c.Dom/IProcessingInstruction.xml
@@ -28,7 +28,7 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>The &lt;code&gt;ProcessingInstruction&lt;/code&gt; interface represents a "processing
+    <summary>The <c>ProcessingInstruction</c> interface represents a "processing
             instruction", used in XML as a way to keep processor-specific information
             in the text of the document.</summary>
     <remarks>
diff --git a/docs/Mono.Android/en/Org.W3c.Dom/IText.xml b/docs/Mono.Android/en/Org.W3c.Dom/IText.xml
index 3e46a9624f..6412bbcbac 100644
--- a/docs/Mono.Android/en/Org.W3c.Dom/IText.xml
+++ b/docs/Mono.Android/en/Org.W3c.Dom/IText.xml
@@ -31,8 +31,8 @@
     </Attribute>
   </Attributes>
   <Docs since="1">
-    <summary>The &lt;code&gt;Text&lt;/code&gt; interface inherits from &lt;code&gt;CharacterData&lt;/code&gt;
-            and represents the textual content (termed <see href="http://www.w3.org/TR/2004/REC-xml-20040204#syntax">character data</see> in XML) of an &lt;code&gt;Element&lt;/code&gt; or &lt;code&gt;Attr&lt;/code&gt;.</summary>
+    <summary>The <c>Text</c> interface inherits from <c>CharacterData</c>
+            and represents the textual content (termed <see href="http://www.w3.org/TR/2004/REC-xml-20040204#syntax">character data</see> in XML) of an <c>Element</c> or <c>Attr</c>.</summary>
     <remarks>
       <para>
         <format type="text/html">
@@ -99,10 +99,10 @@
         <Parameter Name="content" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="content">The content of the replacing &lt;code&gt;Text&lt;/code&gt; node.</param>
+        <param name="content">The content of the replacing <c>Text</c> node.</param>
         <summary>Replaces the text of the current node and all logically-adjacent text
             nodes with the specified text.</summary>
-        <returns>The &lt;code&gt;Text&lt;/code&gt; node created with the specified content.</returns>
+        <returns>The <c>Text</c> node created with the specified content.</returns>
         <remarks>
           <para>
             <format type="text/html">
@@ -144,8 +144,8 @@
       </Parameters>
       <Docs>
         <param name="offset">The 16-bit unit offset at which to split, starting from
-              &lt;code&gt;0&lt;/code&gt;.</param>
-        <summary>Breaks this node into two nodes at the specified &lt;code&gt;offset&lt;/code&gt;,
+              <c>0</c>.</param>
+        <summary>Breaks this node into two nodes at the specified <c>offset</c>,
             keeping both in the tree as siblings.</summary>
         <returns>The new node, of the same type as this node.</returns>
         <remarks>
diff --git a/docs/Mono.Android/en/Org.W3c.Dom/ITypeInfo.xml b/docs/Mono.Android/en/Org.W3c.Dom/ITypeInfo.xml
index 2ac86865a0..cf0ccb27f4 100644
--- a/docs/Mono.Android/en/Org.W3c.Dom/ITypeInfo.xml
+++ b/docs/Mono.Android/en/Org.W3c.Dom/ITypeInfo.xml
@@ -25,8 +25,8 @@
     </Attribute>
   </Attributes>
   <Docs since="8">
-    <summary>The &lt;code&gt;TypeInfo&lt;/code&gt; interface represents a type referenced from
-            &lt;code&gt;Element&lt;/code&gt; or &lt;code&gt;Attr&lt;/code&gt; nodes, specified in the schemas
+    <summary>The <c>TypeInfo</c> interface represents a type referenced from
+            <c>Element</c> or <c>Attr</c> nodes, specified in the schemas
             associated with the document.</summary>
     <remarks>
       <para>
@@ -228,13 +228,13 @@
         <summary>This method returns if there is a derivation between the reference
             type definition, i.</summary>
         <returns>If the document's schema is a DTD or no schema is associated
-              with the document, this method will always return &lt;code&gt;false&lt;/code&gt;
+              with the document, this method will always return <c>false</c>
               .  If the document's schema is an XML Schema, the method will
-              &lt;code&gt;true&lt;/code&gt; if the reference type definition is derived from
+              <c>true</c> if the reference type definition is derived from
               the other type definition according to the derivation parameter. If
-              the value of the parameter is &lt;code&gt;0&lt;/code&gt; (no bit is set to
-              &lt;code&gt;1&lt;/code&gt; for the &lt;code&gt;derivationMethod&lt;/code&gt; parameter),
-              the method will return &lt;code&gt;true&lt;/code&gt; if the other type
+              the value of the parameter is <c>0</c> (no bit is set to
+              <c>1</c> for the <c>derivationMethod</c> parameter),
+              the method will return <c>true</c> if the other type
               definition can be reached by recursing any combination of {base
               type definition}, {item type definition}, or {member type
               definitions} from the reference type definition.</returns>
diff --git a/docs/Mono.Android/en/Org.W3c.Dom/IUserDataHandler.xml b/docs/Mono.Android/en/Org.W3c.Dom/IUserDataHandler.xml
index 658597e98b..bf76e618a2 100644
--- a/docs/Mono.Android/en/Org.W3c.Dom/IUserDataHandler.xml
+++ b/docs/Mono.Android/en/Org.W3c.Dom/IUserDataHandler.xml
@@ -26,7 +26,9 @@
   </Attributes>
   <Docs since="8">
     <summary>When associating an object to a key on a node using
-            &lt;code&gt;Node.</summary>
+            <c>Node.setUserData()</c> the application can provide a handler
+            that gets called when the node the object is associated to is being
+            cloned, imported, or renamed.</summary>
     <remarks>
       <para>
         <format type="text/html">
@@ -74,9 +76,9 @@
         <param name="key">Specifies the key for which this handler is being called.</param>
         <param name="data">Specifies the data for which this handler is being called.</param>
         <param name="src">Specifies the node being cloned, adopted, imported, or
-              renamed. This is &lt;code&gt;null&lt;/code&gt; when the node is being deleted.</param>
+              renamed. This is <c>null</c> when the node is being deleted.</param>
         <param name="dst">Specifies the node newly created if any, or
-              &lt;code&gt;null&lt;/code&gt;.</param>
+              <c>null</c>.</param>
         <summary>This method is called whenever the node for which this handler is
             registered is imported or cloned.</summary>
         <remarks>
@@ -115,7 +117,7 @@
       </ReturnValue>
       <MemberValue>5</MemberValue>
       <Docs>
-        <summary>The node is adopted, using &lt;code&gt;Document.</summary>
+        <summary>The node is adopted, using <c>Document.adoptNode()</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -151,7 +153,7 @@
       </ReturnValue>
       <MemberValue>1</MemberValue>
       <Docs>
-        <summary>The node is cloned, using &lt;code&gt;Node.</summary>
+        <summary>The node is cloned, using <c>Node.cloneNode()</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -223,7 +225,7 @@
       </ReturnValue>
       <MemberValue>2</MemberValue>
       <Docs>
-        <summary>The node is imported, using &lt;code&gt;Document.</summary>
+        <summary>The node is imported, using <c>Document.importNode()</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -259,7 +261,7 @@
       </ReturnValue>
       <MemberValue>4</MemberValue>
       <Docs>
-        <summary>The node is renamed, using &lt;code&gt;Document.</summary>
+        <summary>The node is renamed, using <c>Document.renameNode()</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Org.W3c.Dom/Node.xml b/docs/Mono.Android/en/Org.W3c.Dom/Node.xml
index 8ea8ff85a5..2d42755e60 100644
--- a/docs/Mono.Android/en/Org.W3c.Dom/Node.xml
+++ b/docs/Mono.Android/en/Org.W3c.Dom/Node.xml
@@ -60,7 +60,7 @@
       </ReturnValue>
       <MemberValue>2</MemberValue>
       <Docs>
-        <summary>The node is an &lt;code&gt;Attr&lt;/code&gt;.</summary>
+        <summary>The node is an <c>Attr</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -101,7 +101,7 @@
       </ReturnValue>
       <MemberValue>4</MemberValue>
       <Docs>
-        <summary>The node is a &lt;code&gt;CDATASection&lt;/code&gt;.</summary>
+        <summary>The node is a <c>CDATASection</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -142,7 +142,7 @@
       </ReturnValue>
       <MemberValue>8</MemberValue>
       <Docs>
-        <summary>The node is a &lt;code&gt;Comment&lt;/code&gt;.</summary>
+        <summary>The node is a <c>Comment</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -183,7 +183,7 @@
       </ReturnValue>
       <MemberValue>11</MemberValue>
       <Docs>
-        <summary>The node is a &lt;code&gt;DocumentFragment&lt;/code&gt;.</summary>
+        <summary>The node is a <c>DocumentFragment</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -224,7 +224,7 @@
       </ReturnValue>
       <MemberValue>9</MemberValue>
       <Docs>
-        <summary>The node is a &lt;code&gt;Document&lt;/code&gt;.</summary>
+        <summary>The node is a <c>Document</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -506,7 +506,7 @@
       </ReturnValue>
       <MemberValue>10</MemberValue>
       <Docs>
-        <summary>The node is a &lt;code&gt;DocumentType&lt;/code&gt;.</summary>
+        <summary>The node is a <c>DocumentType</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -547,7 +547,7 @@
       </ReturnValue>
       <MemberValue>1</MemberValue>
       <Docs>
-        <summary>The node is an &lt;code&gt;Element&lt;/code&gt;.</summary>
+        <summary>The node is an <c>Element</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -588,7 +588,7 @@
       </ReturnValue>
       <MemberValue>6</MemberValue>
       <Docs>
-        <summary>The node is an &lt;code&gt;Entity&lt;/code&gt;.</summary>
+        <summary>The node is an <c>Entity</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -629,7 +629,7 @@
       </ReturnValue>
       <MemberValue>5</MemberValue>
       <Docs>
-        <summary>The node is an &lt;code&gt;EntityReference&lt;/code&gt;.</summary>
+        <summary>The node is an <c>EntityReference</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -670,7 +670,7 @@
       </ReturnValue>
       <MemberValue>12</MemberValue>
       <Docs>
-        <summary>The node is a &lt;code&gt;Notation&lt;/code&gt;.</summary>
+        <summary>The node is a <c>Notation</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -711,7 +711,7 @@
       </ReturnValue>
       <MemberValue>7</MemberValue>
       <Docs>
-        <summary>The node is a &lt;code&gt;ProcessingInstruction&lt;/code&gt;.</summary>
+        <summary>The node is a <c>ProcessingInstruction</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -752,7 +752,7 @@
       </ReturnValue>
       <MemberValue>3</MemberValue>
       <Docs>
-        <summary>The node is a &lt;code&gt;Text&lt;/code&gt; node.</summary>
+        <summary>The node is a <c>Text</c> node.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Org.W3c.Dom/UserDataHandler.xml b/docs/Mono.Android/en/Org.W3c.Dom/UserDataHandler.xml
index 9ab401ea9e..06c8f1bb60 100644
--- a/docs/Mono.Android/en/Org.W3c.Dom/UserDataHandler.xml
+++ b/docs/Mono.Android/en/Org.W3c.Dom/UserDataHandler.xml
@@ -59,7 +59,7 @@
       </ReturnValue>
       <MemberValue>5</MemberValue>
       <Docs>
-        <summary>The node is adopted, using &lt;code&gt;Document.</summary>
+        <summary>The node is adopted, using <c>Document.adoptNode()</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -100,7 +100,7 @@
       </ReturnValue>
       <MemberValue>1</MemberValue>
       <Docs>
-        <summary>The node is cloned, using &lt;code&gt;Node.</summary>
+        <summary>The node is cloned, using <c>Node.cloneNode()</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -182,7 +182,7 @@
       </ReturnValue>
       <MemberValue>2</MemberValue>
       <Docs>
-        <summary>The node is imported, using &lt;code&gt;Document.</summary>
+        <summary>The node is imported, using <c>Document.importNode()</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
@@ -223,7 +223,7 @@
       </ReturnValue>
       <MemberValue>4</MemberValue>
       <Docs>
-        <summary>The node is renamed, using &lt;code&gt;Document.</summary>
+        <summary>The node is renamed, using <c>Document.renameNode()</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
diff --git a/docs/Mono.Android/en/Org.Xmlpull.V1.Sax2/Driver.xml b/docs/Mono.Android/en/Org.Xmlpull.V1.Sax2/Driver.xml
index 43737f1b1d..27d0432ce3 100644
--- a/docs/Mono.Android/en/Org.Xmlpull.V1.Sax2/Driver.xml
+++ b/docs/Mono.Android/en/Org.Xmlpull.V1.Sax2/Driver.xml
@@ -1383,7 +1383,7 @@
         <param name="localName">To be added.</param>
         <param name="qName">To be added.</param>
         <summary>Calls <c>ContentHandler#startElement(String, String, String, Attributes) startElement</c>
-            on the &lt;code&gt;ContentHandler&lt;/code&gt; with &lt;code&gt;this&lt;/code&gt; driver object as the
+            on the <c>ContentHandler</c> with <c>this</c> driver object as the
             <c>Attributes</c> implementation.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/index.xml b/docs/Mono.Android/en/index.xml
index 6a675829cd..3939f28ed3 100644
--- a/docs/Mono.Android/en/index.xml
+++ b/docs/Mono.Android/en/index.xml
@@ -911,7 +911,7 @@
           <AttributeName>System.Runtime.CompilerServices.InternalsVisibleTo("Mono.Android.NET-Tests, PublicKey=0024000004800000940000000602000000240000525341310004000011000000438ac2a5acfbf16cbd2b2b47a62762f273df9cb2795ceccdf77d10bf508e69e7a362ea7a45455bbf3ac955e1f2e2814f144e5d817efc4c6502cc012df310783348304e3ae38573c6d658c234025821fda87a0be8a0d504df564e2c93b2b878925f42503e9d54dfef9f9586d9e6f38a305769587b1de01f6c0410328b2c9733db")</AttributeName>
         </Attribute>
         <Attribute>
-          <AttributeName>System.Reflection.AssemblyInformationalVersion("13.1.99.12; git-rev-head:ca8f561; git-branch:main")</AttributeName>
+          <AttributeName>System.Reflection.AssemblyInformationalVersion("13.1.99.15; git-rev-head:2c7d72d; git-branch:main")</AttributeName>
         </Attribute>
       </Attributes>
       <AssemblyPublicKey>[00 24 00 00 04 80 00 00 94 00 00 00 06 02 00 00 00 24 00 00 52 53 41 31 00 04 00 00 11 00 00 00 43 8a c2 a5 ac fb f1 6c bd 2b 2b 47 a6 27 62 f2 73 df 9c b2 79 5c ec cd f7 7d 10 bf 50 8e 69 e7 a3 62 ea 7a 45 45 5b bf 3a c9 55 e1 f2 e2 81 4f 14 4e 5d 81 7e fc 4c 65 02 cc 01 2d f3 10 78 33 48 30 4e 3a e3 85 73 c6 d6 58 c2 34 02 58 21 fd a8 7a 0b e8 a0 d5 04 df 56 4e 2c 93 b2 b8 78 92 5f 42 50 3e 9d 54 df ef 9f 95 86 d9 e6 f3 8a 30 57 69 58 7b 1d e0 1f 6c 04 10 32 8b 2c 97 33 db ]</AssemblyPublicKey>